Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am fbd9b87f: Merge change 23807 into eclair

Browse Source 
Merge commit 'fbd9b87feab649dc7410711ceaa589e5f058c753' into eclair-plus-aosp

* commit 'fbd9b87feab649dc7410711ceaa589e5f058c753':
  Add support for running apps with uid/gid AID_LOG by specifying android.uid.log in the manifest
This commit is contained in:
Mike Lockwood
2009-09-03 11:42:21 -07:00
committed by Android Git Automerger
parent 021856d7a1 fbd9b87fea
commit 0158977091
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/os/Process.java
View File

@@ -73,6 +73,12 @@ public class Process {
*/ */
public static final int SHELL_UID = 2000; public static final int SHELL_UID = 2000;
/**
* Defines the UID/GID for the log group.
* @hide
*/
public static final int LOG_UID = 1007;
/** /**
* Defines the UID/GID for the WIFI supplicant process. * Defines the UID/GID for the WIFI supplicant process.
* @hide * @hide

5
services/java/com/android/server/PackageManagerService.java
View File

@@ -112,6 +112,7 @@ class PackageManagerService extends IPackageManager.Stub {
private static final boolean MULTIPLE_APPLICATION_UIDS = true; private static final boolean MULTIPLE_APPLICATION_UIDS = true;
private static final int RADIO_UID = Process.PHONE_UID; private static final int RADIO_UID = Process.PHONE_UID;
private static final int LOG_UID = Process.LOG_UID;
private static final int FIRST_APPLICATION_UID = private static final int FIRST_APPLICATION_UID =
Process.FIRST_APPLICATION_UID; Process.FIRST_APPLICATION_UID;
private static final int MAX_APPLICATION_UIDS = 1000; private static final int MAX_APPLICATION_UIDS = 1000;
@@ -364,6 +365,10 @@ class PackageManagerService extends IPackageManager.Stub {
MULTIPLE_APPLICATION_UIDS MULTIPLE_APPLICATION_UIDS
? RADIO_UID : FIRST_APPLICATION_UID, ? RADIO_UID : FIRST_APPLICATION_UID,
ApplicationInfo.FLAG_SYSTEM); ApplicationInfo.FLAG_SYSTEM);
mSettings.addSharedUserLP("android.uid.log",
MULTIPLE_APPLICATION_UIDS
? LOG_UID : FIRST_APPLICATION_UID,
ApplicationInfo.FLAG_SYSTEM);
String separateProcesses = SystemProperties.get("debug.separate_processes"); String separateProcesses = SystemProperties.get("debug.separate_processes");
if (separateProcesses != null && separateProcesses.length() > 0) { if (separateProcesses != null && separateProcesses.length() > 0) {