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

Commit 856f63c0 authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Android (Google) Code Review
Browse files

Merge "Revert "Add keychain user""

parents 8648c379 04918930

include/private/android_filesystem_config.h

+2 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
#define AID_KEYSTORE      1017  /* keystore subsystem */

#define AID_USB           1018  /* USB devices */

#define AID_DRM           1019  /* DRM server */

#define AID_KEYCHAIN      1020  /* keychain service */

#define AID_AVAILABLE     1020  /* available for use */

#define AID_GPS           1021  /* GPS daemon */

#define AID_UNUSED1       1022  /* deprecated, DO NOT USE */

#define AID_MEDIA_RW      1023  /* internal media storage write access */
@@ -103,7 +103,7 @@ static const struct android_id_info android_ids[] = { 
    { "install",   AID_INSTALL, },

    { "media",     AID_MEDIA, },

    { "drm",       AID_DRM, },

    { "keychain",  AID_KEYCHAIN, },

    { "available", AID_AVAILABLE, },

    { "nfc",       AID_NFC, },

    { "shell",     AID_SHELL, },

    { "cache",     AID_CACHE, },

rootdir/init.rc

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ on post-fs-data 
    mkdir /data/misc/bluetoothd 0770 bluetooth bluetooth

    mkdir /data/misc/bluetooth 0770 system system

    mkdir /data/misc/keystore 0700 keystore keystore

    mkdir /data/misc/keychain 0771 keychain keychain

    mkdir /data/misc/keychain 0771 system system

    mkdir /data/misc/vpn 0770 system system

    mkdir /data/misc/systemkeys 0700 system system

    mkdir /data/misc/vpn/profiles 0770 system system