diff options
| author | goneil <goneil@google.com> | 2018-01-10 16:23:11 -0800 |
|---|---|---|
| committer | goneil <goneil@google.com> | 2018-02-22 16:39:01 -0800 |
| commit | 6db18a9badeaf76ccfdbf745fa356f2fe024df87 (patch) | |
| tree | 50af3037639c4418010be32a73fb224cf81de9df /core/java | |
| parent | cfd17093cd9cb092a7c3c31eb8afb7e91525a06c (diff) | |
Allow certificates to be stored in the carrier app whitelist
Use CARRIER_APP_WHITELIST to store app certificate mapped to package
name (instead of just package name as we had before).
Bug: 70042722
Test: SettingsBackupTest
Test: UiccProfileTest#testParseWhitelistMapFromString() for parsing map
Change-Id: Ia0c7c364cd8154272ef62cbbf412036b4eae1b21
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/provider/Settings.java | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 68490ed24ac0..bb1df2113e14 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -9077,14 +9077,18 @@ public final class Settings { */ public static final String TETHER_OFFLOAD_DISABLED = "tether_offload_disabled"; - /** - * List of carrier apps which are whitelisted to prompt the user for install when - * a sim card with matching uicc carrier privilege rules is inserted. - * - * The value is "package1;package2;..." - * @hide - */ - public static final String CARRIER_APP_WHITELIST = "carrier_app_whitelist"; + /** + * List of certificate (hex string representation of the application's certificate - SHA-1 + * or SHA-256) and carrier app package pairs which are whitelisted to prompt the user for + * install when a sim card with matching UICC carrier privilege rules is inserted. The + * certificate is used as a key, so the certificate encoding here must be the same as the + * certificate encoding used on the SIM. + * + * The value is "cert1:package1;cert2:package2;..." + * @hide + */ + @SystemApi + public static final String CARRIER_APP_WHITELIST = "carrier_app_whitelist"; /** * USB Mass Storage Enabled |