diff options
| author | Adnan Begovic <adnan@cyngn.com> | 2015-09-15 14:57:28 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-10-28 13:30:34 -0700 |
| commit | 6615d36cf0fa7daef6a55373996beb65950a2885 (patch) | |
| tree | 63e4f01768a69d1d64ae8b9f1475daab7182bef6 /core | |
| parent | a8ee5c9a1f7524b7434e9dcf6f406a5142cae5a8 (diff) | |
| download | frameworks_base-6615d36cf0fa7daef6a55373996beb65950a2885.zip frameworks_base-6615d36cf0fa7daef6a55373996beb65950a2885.tar.gz frameworks_base-6615d36cf0fa7daef6a55373996beb65950a2885.tar.bz2 | |
prebundled: Handle prebundled packages per-user.
Also add migration step for reading old file to go towards
per-user system file structure
TICKET: CYNGNOS-1006
Change-Id: I743e8efaa074c9b84291fdc8d3d15763cc39e79d
pm: Create per-mcc prebundled install filter.
If packages are region locked, avoid installing them
for the SKU, otherwise if a package is specified for
a mobile country code, allow it to be installed.
TICKET: CYNGNOS-912
Change-Id: I69c5be62dff771fc7d3117e9edf65d8ea4150f28
pm: Update PackageManagerSettingsTests.
Change-Id: Ib3a23514055935f68f3f3bb4fd2b2d4d495c1132
PackageManager : Extend prebundled logic
Instead of specifying which packages to explicitly install,
Only install packages if :
a) Its in the current mcc's config_region_locked_packages
b) Its not region locked by checking config_restrict_to_region_locked_devices
Change-Id: I74c13763ef367e16e5e79290a569f3a720b85adc
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 8 | ||||
| -rw-r--r-- | core/res/res/values/cm_symbols.xml | 7 | ||||
| -rwxr-xr-x | core/res/res/values/config.xml | 8 |
3 files changed, 23 insertions, 0 deletions
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 0fa5f51..3dddefe 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -870,6 +870,14 @@ public abstract class PackageManager { public static final int INSTALL_FAILED_UNINSTALLED_PREBUNDLE = -403; /** + * Used for prebundles + * Installation failed for a prebundled app because it wasn't needed in the default + * mobile country exported by the hardware + * @hide + */ + public static final int INSTALL_FAILED_REGION_LOCKED_PREBUNDLE = -404; //bloat not found + + /** * Flag parameter for {@link #deletePackage} to indicate that you don't want to delete the * package's data directory. * diff --git a/core/res/res/values/cm_symbols.xml b/core/res/res/values/cm_symbols.xml index d127227..1705356 100644 --- a/core/res/res/values/cm_symbols.xml +++ b/core/res/res/values/cm_symbols.xml @@ -102,4 +102,11 @@ <!-- WiFi turn off notification --> <java-symbol type="string" name="notify_turn_wifi_off_title" /> + + <!-- Region locked prebundled packages (per mcc) --> + <java-symbol type="array" name="config_region_locked_packages" /> + + <!-- Packages in this list should be a union of all packages defined in values-mccxxx (mcc) --> + <java-symbol type="array" name="config_restrict_to_region_locked_devices" /> + </resources> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index b87a5fc..bd018cc 100755 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2473,4 +2473,12 @@ <!-- Boolean to enable Stylus gestures --> <bool name="config_stylusGestures">false</bool> + <!-- Config to enable installation of region locked packages --> + <string-array name="config_region_locked_packages" translatable="false"> + </string-array> + + <!-- Packages in this list should be a union of all packages defined in values-mccxxx (mcc) --> + <string-array name="config_restrict_to_region_locked_devices" translatable="false"> + </string-array> + </resources> |