diff options
| author | Makoto Onuki <omakoto@google.com> | 2017-12-11 16:38:11 -0800 |
|---|---|---|
| committer | Makoto Onuki <omakoto@google.com> | 2017-12-11 16:49:54 -0800 |
| commit | 708703bf39801027b616bcc43c650889bf0ef571 (patch) | |
| tree | 92e3d4cefe0edaa9f96892a3a56f5641edb01334 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 454c831d1d66e19eb282d0f99c7a682db4a9ae9d (diff) | |
Avoid strict mode violation in shortcut manager on user-unlock
- The issue is the shortcut host information was stored in ShortcutUser, which
is per-user shortcut information that's persisted in the disk. Even though in
the onUnlockUser sequence we only need to "set" a package name, in order to
access the ShortcutUser instance for the target user, we'd need to load the
per-user information from the disk.
- Luckily the host packages don't need to be persisted, so let's just move
it to another structure which is just kept in memory.
Bug: 70526858
Test: Manual test (boot, unlock user, unlock secondary user)
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest1 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest2 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest3 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest4 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest5 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest6 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest7 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest8 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest9 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest10 -w com.android.frameworks.servicestests
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsShortcutManagerTestCases
Change-Id: Ic4b842c4a3a08a7f0e678ce328e9d4ee08fd4069
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions