Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4b92ec5 authored by Brian Carlstrom's avatar Brian Carlstrom
Browse files

Revert "Add keychain user with special keystore access permissions" 

This reverts commit 8c2a1a90.

Conflicts:

	cmds/keystore/keystore.c

Bug:4970237
Change-Id: I626023d695becfada47e5f319b18e0889b766563
parent ce43bc48

cmds/keystore/keystore.cpp

+0 −1
Original line number Diff line number Diff line
@@ -712,7 +712,6 @@ static struct user { 
    {AID_VPN,      AID_SYSTEM, GET},

    {AID_WIFI,     AID_SYSTEM, GET},

    {AID_ROOT,     AID_SYSTEM, GET},

    {AID_KEYCHAIN, AID_SYSTEM, TEST | GET | SAW},

    {~0,           ~0,         TEST | GET | INSERT | DELETE | EXIST | SAW},

};

core/java/android/os/Process.java

+0 −6
Original line number Diff line number Diff line
@@ -91,12 +91,6 @@ public class Process { 
     */

    public static final int SDCARD_RW_GID = 1015;



    /**

     * Defines the UID for the KeyChain service.

     * @hide

     */

    public static final int KEYCHAIN_UID = 1020;



    /**

     * Defines the UID/GID for the NFC service process.

     * @hide

services/java/com/android/server/pm/PackageManagerService.java

+0 −5
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ public class PackageManagerService extends IPackageManager.Stub { 
    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 KEYCHAIN_UID = Process.KEYCHAIN_UID;

    static final int FIRST_APPLICATION_UID =

        Process.FIRST_APPLICATION_UID;

    static final int MAX_APPLICATION_UIDS = 1000;
@@ -761,10 +760,6 @@ public class PackageManagerService extends IPackageManager.Stub { 
                MULTIPLE_APPLICATION_UIDS

                        ? NFC_UID : FIRST_APPLICATION_UID,

                ApplicationInfo.FLAG_SYSTEM);

        mSettings.addSharedUserLPw("android.uid.keychain",

                MULTIPLE_APPLICATION_UIDS

                        ? KEYCHAIN_UID : FIRST_APPLICATION_UID,

                ApplicationInfo.FLAG_SYSTEM);



        String separateProcesses = SystemProperties.get("debug.separate_processes");

        if (separateProcesses != null && separateProcesses.length() > 0) {