Merge "Disable home intent receiver for kiosk mode by default" into mnc-dev

Author: bfranz

app/src/main/AndroidManifest.xml

@@ -43,7 +43,8 @@ limitations under the License.
         <activity
                 android:name=".policy.locktask.KioskModeActivity"
                 android:label="@string/kiosk_mode"
-                android:launchMode="singleInstance">
+                android:launchMode="singleInstance"
+                android:enabled="false">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.HOME"/>

app/src/main/java/com/google/android/testdpc/policy/PolicyManagementFragment.java

@@ -1600,6 +1600,10 @@ private void startKioskMode(String[] lockTaskArray) {
         Intent launchIntent = new Intent(getActivity(), KioskModeActivity.class);
         launchIntent.putExtra(KioskModeActivity.LOCKED_APP_PACKAGE_LIST, lockTaskArray);
         launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        getActivity().getPackageManager().setComponentEnabledSetting(
+                new ComponentName(mPackageName, KioskModeActivity.class.getName()),
+                PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
+                PackageManager.DONT_KILL_APP);
         startActivity(launchIntent);
         getActivity().finish();
     }

app/src/main/java/com/google/android/testdpc/policy/locktask/KioskModeActivity.java

@@ -93,8 +93,11 @@ protected void onCreate(Bundle savedInstanceState) {
             for (String pkg : packageArray) {
                 mKioskPackages.add(pkg);
             }
+            mKioskPackages.remove(getPackageName());
+            mKioskPackages.add(getPackageName());
             setDefaultKioskPolicies(true);
         } else {
+            // after a reboot there is no need to set the policies again
             SharedPreferences sharedPreferences = getSharedPreferences(KIOSK_PREFERENCE_FILE,
                     MODE_PRIVATE);
             mKioskPackages = new ArrayList<>(sharedPreferences.getStringSet(KIOSK_APPS_KEY,
@@ -135,6 +138,10 @@ protected void onStart() {
     public void onBackdoorClicked() {
         stopLockTask();
         setDefaultKioskPolicies(false);
+        mPackageManager.setComponentEnabledSetting(
+                new ComponentName(getPackageName(), getClass().getName()),
+                PackageManager.COMPONENT_ENABLED_STATE_DEFAULT,
+                PackageManager.DONT_KILL_APP);
         finish();
     }