Merge "merge from master" into mm-wireless-dev (a11d3ac4) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -27003,7 +27003,10 @@ package android.provider {
		public static final class Telephony.Sms.Intents {
		method public static android.telephony.SmsMessage[] getMessagesFromIntent(android.content.Intent);
		field public static final java.lang.String ACTION_CHANGE_DEFAULT = "android.provider.Telephony.ACTION_CHANGE_DEFAULT";
		field public static final java.lang.String ACTION_DEFAULT_SMS_PACKAGE_CHANGED = "android.provider.action.DEFAULT_SMS_PACKAGE_CHANGED";
		field public static final java.lang.String ACTION_EXTERNAL_PROVIDER_CHANGE = "android.provider.action.EXTERNAL_PROVIDER_CHANGE";
		field public static final java.lang.String DATA_SMS_RECEIVED_ACTION = "android.intent.action.DATA_SMS_RECEIVED";
		field public static final java.lang.String EXTRA_IS_DEFAULT_SMS_APP = "android.provider.extra.IS_DEFAULT_SMS_APP";
		field public static final java.lang.String EXTRA_PACKAGE_NAME = "package";
		field public static final int RESULT_SMS_DUPLICATED = 5; // 0x5
		field public static final int RESULT_SMS_GENERIC_ERROR = 2; // 0x2
		@@ -30585,6 +30588,7 @@ package android.telephony {
		field public static final java.lang.String KEY_AUTO_RETRY_ENABLED_BOOL = "auto_retry_enabled_bool";
		field public static final java.lang.String KEY_CARRIER_ALLOW_TURNOFF_IMS_BOOL = "carrier_allow_turnoff_ims_bool";
		field public static final java.lang.String KEY_CARRIER_SETTINGS_ENABLE_BOOL = "carrier_settings_enable_bool";
		field public static final java.lang.String KEY_CARRIER_USE_IMS_FIRST_FOR_EMERGENCY_BOOL = "carrier_use_ims_first_for_emergency_bool";
		field public static final java.lang.String KEY_CARRIER_VOLTE_AVAILABLE_BOOL = "carrier_volte_available_bool";
		field public static final java.lang.String KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL = "carrier_volte_provisioning_required_bool";
		field public static final java.lang.String KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL = "carrier_volte_tty_supported_bool";

api/system-current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -29066,7 +29066,10 @@ package android.provider {
		public static final class Telephony.Sms.Intents {
		method public static android.telephony.SmsMessage[] getMessagesFromIntent(android.content.Intent);
		field public static final java.lang.String ACTION_CHANGE_DEFAULT = "android.provider.Telephony.ACTION_CHANGE_DEFAULT";
		field public static final java.lang.String ACTION_DEFAULT_SMS_PACKAGE_CHANGED = "android.provider.action.DEFAULT_SMS_PACKAGE_CHANGED";
		field public static final java.lang.String ACTION_EXTERNAL_PROVIDER_CHANGE = "android.provider.action.EXTERNAL_PROVIDER_CHANGE";
		field public static final java.lang.String DATA_SMS_RECEIVED_ACTION = "android.intent.action.DATA_SMS_RECEIVED";
		field public static final java.lang.String EXTRA_IS_DEFAULT_SMS_APP = "android.provider.extra.IS_DEFAULT_SMS_APP";
		field public static final java.lang.String EXTRA_PACKAGE_NAME = "package";
		field public static final int RESULT_SMS_DUPLICATED = 5; // 0x5
		field public static final int RESULT_SMS_GENERIC_ERROR = 2; // 0x2
		@@ -32829,6 +32832,7 @@ package android.telephony {
		field public static final java.lang.String KEY_AUTO_RETRY_ENABLED_BOOL = "auto_retry_enabled_bool";
		field public static final java.lang.String KEY_CARRIER_ALLOW_TURNOFF_IMS_BOOL = "carrier_allow_turnoff_ims_bool";
		field public static final java.lang.String KEY_CARRIER_SETTINGS_ENABLE_BOOL = "carrier_settings_enable_bool";
		field public static final java.lang.String KEY_CARRIER_USE_IMS_FIRST_FOR_EMERGENCY_BOOL = "carrier_use_ims_first_for_emergency_bool";
		field public static final java.lang.String KEY_CARRIER_VOLTE_AVAILABLE_BOOL = "carrier_volte_available_bool";
		field public static final java.lang.String KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL = "carrier_volte_provisioning_required_bool";
		field public static final java.lang.String KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL = "carrier_volte_tty_supported_bool";

core/java/android/content/pm/UserInfo.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -37,8 +37,8 @@ public class UserInfo implements Parcelable {
		*/

		/**
		* Primary user. Only one user can have this flag set. Meaning of this
		* flag TBD.
		* Primary user. Only one user can have this flag set. It identifies the first human user
		* on a device.
		*/
		public static final int FLAG_PRIMARY = 0x00000001;

core/java/android/os/IUserManager.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@ interface IUserManager {
		void setUserName(int userHandle, String name);
		void setUserIcon(int userHandle, in Bitmap icon);
		ParcelFileDescriptor getUserIcon(int userHandle);
		UserInfo getPrimaryUser();
		List<UserInfo> getUsers(boolean excludeDying);
		List<UserInfo> getProfiles(int userHandle, boolean enabledOnly);
		boolean canAddMoreManagedProfiles();

core/java/android/os/UserHandle.java

+17 −3

Original line number	Diff line number	Diff line
		@@ -55,12 +55,26 @@ public final class UserHandle implements Parcelable {
		/** @hide An undefined user id */
		public static final int USER_NULL = -10000;

		/** @hide A user id constant to indicate the "owner" user of the device */
		/**
		* @hide A user id constant to indicate the "owner" user of the device
		* @deprecated Consider using either USER_SYSTEM constant or
		* UserInfo.isPrimary().
		*/
		public static final int USER_OWNER = 0;

		/** @hide A user handle to indicate the primary/owner user of the device */
		/**
		* @hide A user handle to indicate the primary/owner user of the device
		* @deprecated Consider using either SYSTEM constant or
		* UserInfo.isPrimary().
		*/
		public static final UserHandle OWNER = new UserHandle(USER_OWNER);

		/** @hide A user id constant to indicate the "system" user of the device */
		public static final int USER_SYSTEM = 0;

		/** @hide A user handle to indicate the "system" user of the device */
		public static final UserHandle SYSTEM = new UserHandle(USER_SYSTEM);

		/**
		* @hide Enable multi-user related side effects. Set this to false if
		* there are problems with single user use-cases.
		@@ -120,7 +134,7 @@ public final class UserHandle implements Parcelable {
		if (MU_ENABLED) {
		return uid / PER_USER_RANGE;
		} else {
		return 0;
		return UserHandle.USER_SYSTEM;
		}
		}