Merge "Expose APIs used by CtsPermissionTestCases" (8d7b81e6) · Commits · e / os / android_frameworks_base

api/test-current.txt

+26 −0

Original line number	Diff line number	Diff line
		package android {

		public static final class Manifest.permission {
		field public static final java.lang.String ACCESS_NOTIFICATIONS = "android.permission.ACCESS_NOTIFICATIONS";
		field public static final java.lang.String ACTIVITY_EMBEDDING = "android.permission.ACTIVITY_EMBEDDING";
		field public static final java.lang.String BRIGHTNESS_SLIDER_USAGE = "android.permission.BRIGHTNESS_SLIDER_USAGE";
		field public static final java.lang.String CHANGE_APP_IDLE_STATE = "android.permission.CHANGE_APP_IDLE_STATE";
		field public static final java.lang.String CONFIGURE_DISPLAY_BRIGHTNESS = "android.permission.CONFIGURE_DISPLAY_BRIGHTNESS";
		field public static final java.lang.String MANAGE_ACTIVITY_STACKS = "android.permission.MANAGE_ACTIVITY_STACKS";
		field public static final java.lang.String READ_CELL_BROADCASTS = "android.permission.READ_CELL_BROADCASTS";
		}

		}
		@@ -61,9 +64,12 @@ package android.app {
		public class AppOpsManager {
		method public static java.lang.String[] getOpStrs();
		method public boolean isOperationActive(int, int, java.lang.String);
		method public static java.lang.String opToPermission(int);
		method public static int permissionToOpCode(java.lang.String);
		method public void setMode(int, int, java.lang.String, int);
		method public void startWatchingActive(int[], android.app.AppOpsManager.OnOpActiveChangedListener);
		method public void stopWatchingActive(android.app.AppOpsManager.OnOpActiveChangedListener);
		method public static int strOpToOp(java.lang.String);
		field public static final java.lang.String OPSTR_ACCEPT_HANDOVER = "android:accept_handover";
		field public static final java.lang.String OPSTR_ACCESS_NOTIFICATIONS = "android:access_notifications";
		field public static final java.lang.String OPSTR_ACTIVATE_VPN = "android:activate_vpn";
		@@ -109,6 +115,7 @@ package android.app {
		field public static final java.lang.String OPSTR_WRITE_WALLPAPER = "android:write_wallpaper";
		field public static final int OP_RECORD_AUDIO = 27; // 0x1b
		field public static final int OP_SYSTEM_ALERT_WINDOW = 24; // 0x18
		field public static final int _NUM_OP = 77; // 0x4d
		}

		public static abstract interface AppOpsManager.OnOpActiveChangedListener {
		@@ -222,11 +229,16 @@ package android.content {
		}

		public abstract class Context {
		method public abstract java.lang.String getOpPackageName();
		method public android.os.UserHandle getUser();
		method public int getUserId();
		method public void setAutofillCompatibilityEnabled(boolean);
		}

		public class ContextWrapper extends android.content.Context {
		method public java.lang.String getOpPackageName();
		}

		}

		package android.content.pm {
		@@ -471,6 +483,10 @@ package android.location {
		method public void setType(int);
		}

		public class Location implements android.os.Parcelable {
		method public void makeComplete();
		}

		public class LocationManager {
		method public java.lang.String[] getBackgroundThrottlingWhitelist();
		}
		@@ -667,6 +683,7 @@ package android.os {
		public final class UserHandle implements android.os.Parcelable {
		method public static int getAppId(int);
		method public int getIdentifier();
		method public static boolean isApp(int);
		field public static final android.os.UserHandle SYSTEM;
		}

		@@ -737,6 +754,14 @@ package android.print {

		package android.provider {

		public static final class ContactsContract.CommonDataKinds.Phone implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins {
		field public static final android.net.Uri ENTERPRISE_CONTENT_URI;
		}

		public static final class ContactsContract.RawContactsEntity implements android.provider.BaseColumns android.provider.ContactsContract.DataColumns android.provider.ContactsContract.RawContactsColumns {
		field public static final android.net.Uri CORP_CONTENT_URI;
		}

		public final class Settings {
		field public static final java.lang.String ACTION_ENTERPRISE_PRIVACY_SETTINGS = "android.settings.ENTERPRISE_PRIVACY_SETTINGS";
		}
		@@ -966,6 +991,7 @@ package android.telephony {
		method public void setCarrierTestOverride(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String);
		field public static final int UNKNOWN_CARRIER_ID_LIST_VERSION = -1; // 0xffffffff
		}

		}

		package android.telephony.mbms {

config/hiddenapi-light-greylist.txt

+0 −2

Original line number	Diff line number	Diff line
		@@ -228,10 +228,8 @@ Landroid/app/AppOpsManager;->OP_VIBRATE:I
		Landroid/app/AppOpsManager;->OP_WIFI_SCAN:I
		Landroid/app/AppOpsManager;->OP_WRITE_CONTACTS:I
		Landroid/app/AppOpsManager;->OP_WRITE_SMS:I
		Landroid/app/AppOpsManager;->permissionToOpCode(Ljava/lang/String;)I
		Landroid/app/AppOpsManager;->setRestriction(III[Ljava/lang/String;)V
		Landroid/app/AppOpsManager;->sOpPerms:[Ljava/lang/String;
		Landroid/app/AppOpsManager;->strOpToOp(Ljava/lang/String;)I
		Landroid/app/backup/BackupDataInput$EntityHeader;->dataSize:I
		Landroid/app/backup/BackupDataInput$EntityHeader;->key:Ljava/lang/String;
		Landroid/app/backup/BackupDataInputStream;->dataSize:I

config/hiddenapi-vendor-list.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -82,7 +82,6 @@ Landroid/content/ContentProvider;->getIContentProvider()Landroid/content/IConten
		Landroid/content/ContentResolver;->registerContentObserver(Landroid/net/Uri;ZLandroid/database/ContentObserver;I)V
		Landroid/content/ContentValues;->getStringArrayList(Ljava/lang/String;)Ljava/util/ArrayList;
		Landroid/content/ContentValues;->putStringArrayList(Ljava/lang/String;Ljava/util/ArrayList;)V
		Landroid/content/Context;->getOpPackageName()Ljava/lang/String;
		Landroid/content/Context;->registerReceiverAsUser(Landroid/content/BroadcastReceiver;Landroid/os/UserHandle;Landroid/content/IntentFilter;Ljava/lang/String;Landroid/os/Handler;)Landroid/content/Intent;
		Landroid/content/Context;->startActivityAsUser(Landroid/content/Intent;Landroid/os/UserHandle;)V
		Landroid/content/Context;->startServiceAsUser(Landroid/content/Intent;Landroid/os/UserHandle;)Landroid/content/ComponentName;

core/java/android/app/AppOpsManager.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -317,6 +317,7 @@ public class AppOpsManager {
		/** @hide Any app start foreground service. */
		public static final int OP_START_FOREGROUND = 76;
		/** @hide */
		@TestApi
		public static final int _NUM_OP = 77;

		/** Access to coarse location information. */
		@@ -1376,6 +1377,7 @@ public class AppOpsManager {
		* Retrieve the permission associated with an operation, or null if there is not one.
		* @hide
		*/
		@TestApi
		public static String opToPermission(int op) {
		return sOpPerms[op];
		}
		@@ -1394,6 +1396,7 @@ public class AppOpsManager {
		* to the corresponding app op.
		* @hide
		*/
		@TestApi
		public static int permissionToOpCode(String permission) {
		Integer boxedOpCode = sPermToOp.get(permission);
		return boxedOpCode != null ? boxedOpCode : OP_NONE;
		@@ -1993,6 +1996,7 @@ public class AppOpsManager {
		/**
		* {@hide}
		*/
		@TestApi
		public static int strOpToOp(String op) {
		Integer val = sOpStrToOp.get(op);
		if (val == null) {

core/java/android/content/Context.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -729,6 +729,7 @@ public abstract class Context {
		* cases where system components are loaded into other app processes, in which
		* case this will be the name of the primary package in that process (so that app
		* ops uid verification will work with the name). */
		@TestApi
		public abstract String getOpPackageName();

		/** Return the full application info for this context's package. */