diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2014-07-14 12:02:01 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2014-07-18 16:10:34 -0700 |
| commit | c5c60ad3592f53549c9ffaa58e9a87b0480080e8 (patch) | |
| tree | a4c01c55af65ca0262f9dfeade896fef263c7b0a /src/com/android/launcher3/LauncherModel.java | |
| parent | e8a30577f7451ed0f50ce7cd86e0d3f0c0e0d0bc (diff) | |
| download | android_packages_apps_Trebuchet-c5c60ad3592f53549c9ffaa58e9a87b0480080e8.tar.gz android_packages_apps_Trebuchet-c5c60ad3592f53549c9ffaa58e9a87b0480080e8.tar.bz2 android_packages_apps_Trebuchet-c5c60ad3592f53549c9ffaa58e9a87b0480080e8.zip | |
Merging Motorola's patch to disable apps when is safe mode.
issue: 16044192
Change-Id: I10069dcdf459ecc71361271e883eabb743d77822
Diffstat (limited to 'src/com/android/launcher3/LauncherModel.java')
| -rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index b01db7194..a8bace8e2 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -2047,6 +2047,8 @@ public class LauncherModel extends BroadcastReceiver info.spanX = 1; info.spanY = 1; info.intent.putExtra(ItemInfo.EXTRA_PROFILE, serialNumber); + info.isDisabled = isSafeMode + && !Utilities.isSystemApp(context, intent); // check & update map of what's occupied deleteOnInvalidPlacement.set(false); |