From 04918930236981a6d2a096a73854caa96cb94bda Mon Sep 17 00:00:00 2001 From: Brian Carlstrom Date: Thu, 30 Jun 2011 22:50:29 -0700 Subject: [PATCH] Revert "Add keychain user" This reverts commit 6541ef1562ccf93e498d653598330a7fc80ad2b2. Bug:4970237 Change-Id: I23a90eb89c1d19893d2ba7065fc624c0521cb06e --- include/private/android_filesystem_config.h | 4 ++-- rootdir/init.rc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h index 6e42ae9a9..fc71a1e24 100644 --- a/include/private/android_filesystem_config.h +++ b/include/private/android_filesystem_config.h @@ -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, }, diff --git a/rootdir/init.rc b/rootdir/init.rc index 26c3acbd7..a1f55819a 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -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