From a5c4d4b4a49bff1cc311434c9fc8564bef8a10db Mon Sep 17 00:00:00 2001 From: Konsta Date: Wed, 3 Jul 2013 11:30:39 +0300 Subject: [PATCH 1/2] qcom-fm: add support for mr1 based fm solution Change-Id: I67119e3d13d5213cde52f53c948edb7204a5403b --- core/java/android/os/Process.java | 6 ++++++ data/etc/platform.xml | 2 ++ .../android/server/pm/PackageManagerService.java | 8 ++++++++ 3 files changed, 16 insertions(+) diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java index 10a639b..d2db317 100644 --- a/core/java/android/os/Process.java +++ b/core/java/android/os/Process.java @@ -109,6 +109,12 @@ public class Process { */ public static final int VPN_UID = 1016; + /** + * Defines the UID/GID for the FM process. + * @hide + */ + public static final int FM_RADIO_UID = 1029; + /** * Defines the UID/GID for the NFC service process. * @hide diff --git a/data/etc/platform.xml b/data/etc/platform.xml index e31a2fc..9a0f680 100644 --- a/data/etc/platform.xml +++ b/data/etc/platform.xml @@ -189,5 +189,7 @@ file="/system/framework/android.test.runner.jar" /> + diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java index cb3fa3b..b0f8bf3 100644 --- a/services/java/com/android/server/pm/PackageManagerService.java +++ b/services/java/com/android/server/pm/PackageManagerService.java @@ -176,9 +176,14 @@ public class PackageManagerService extends IPackageManager.Stub { private static final boolean DEBUG_APP_DIR_OBSERVER = false; private static final boolean DEBUG_VERIFY = false; + static final boolean MULTIPLE_APPLICATION_UIDS = true; private static final int RADIO_UID = Process.PHONE_UID; private static final int LOG_UID = Process.LOG_UID; private static final int NFC_UID = Process.NFC_UID; + private static final int FM_RADIO_UID = Process.FM_RADIO_UID; + static final int FIRST_APPLICATION_UID = + Process.FIRST_APPLICATION_UID; + static final int MAX_APPLICATION_UIDS = 1000; private static final boolean GET_CERTIFICATES = true; @@ -895,6 +900,9 @@ public class PackageManagerService extends IPackageManager.Stub { mSettings.addSharedUserLPw("android.uid.log", LOG_UID, ApplicationInfo.FLAG_SYSTEM); mSettings.addSharedUserLPw("com.tmobile.thememanager", THEME_MAMANER_GUID, ApplicationInfo.FLAG_SYSTEM); mSettings.addSharedUserLPw("android.uid.nfc", NFC_UID, ApplicationInfo.FLAG_SYSTEM); + mSettings.addSharedUserLPw("android.uid.fm_radio", + MULTIPLE_APPLICATION_UIDS ? FM_RADIO_UID : FIRST_APPLICATION_UID, + ApplicationInfo.FLAG_SYSTEM); String separateProcesses = SystemProperties.get("debug.separate_processes"); if (separateProcesses != null && separateProcesses.length() > 0) { -- 1.7.9.5