Snap for 4939496 from fd2458518271f1c442733003d00a2ff1373f9fb9 to pi-qpr1-release (aff93b4d) · Commits · e / os / android_frameworks_base

core/java/android/os/Build.java

+22 −8

Original line number	Diff line number	Diff line
		@@ -624,7 +624,8 @@ public class Build {
		* October 2013: Android 4.4, KitKat, another tasty treat.
		*
		* <p>Applications targeting this or a later release will get these
		* new changes in behavior:</p>
		* new changes in behavior. For more information about this release, see the
		* <a href="/about/versions/kitkat/">Android KitKat overview</a>.</p>
		* <ul>
		* <li> The default result of
		* {@link android.preference.PreferenceActivity#isValidFragment(String)
		@@ -674,7 +675,8 @@ public class Build {
		* November 2014: Lollipop. A flat one with beautiful shadows. But still tasty.
		*
		* <p>Applications targeting this or a later release will get these
		* new changes in behavior:</p>
		* new changes in behavior. For more information about this release, see the
		* <a href="/about/versions/lollipop/">Android Lollipop overview</a>.</p>
		* <ul>
		* <li> {@link android.content.Context#bindService Context.bindService} now
		* requires an explicit Intent, and will throw an exception if given an implicit
		@@ -703,6 +705,8 @@ public class Build {

		/**
		* March 2015: Lollipop with an extra sugar coating on the outside!
		* For more information about this release, see the
		* <a href="/about/versions/android-5.1">Android 5.1 APIs</a>.
		*/
		public static final int LOLLIPOP_MR1 = 22;

		@@ -710,7 +714,8 @@ public class Build {
		* M is for Marshmallow!
		*
		* <p>Applications targeting this or a later release will get these
		* new changes in behavior:</p>
		* new changes in behavior. For more information about this release, see the
		* <a href="/about/versions/marshmallow/">Android 6.0 Marshmallow overview</a>.</p>
		* <ul>
		* <li> Runtime permissions. Dangerous permissions are no longer granted at
		* install time, but must be requested by the application at runtime through
		@@ -741,7 +746,8 @@ public class Build {
		* N is for Nougat.
		*
		* <p>Applications targeting this or a later release will get these
		* new changes in behavior:</p>
		* new changes in behavior. For more information about this release, see
		* the <a href="/about/versions/nougat/">Android Nougat overview</a>.</p>
		* <ul>
		* <li> {@link android.app.DownloadManager.Request#setAllowedNetworkTypes
		* DownloadManager.Request.setAllowedNetworkTypes}
		@@ -791,7 +797,9 @@ public class Build {
		public static final int N = 24;

		/**
		* N MR1: Nougat++.
		* N MR1: Nougat++. For more information about this release, see
		* <a href="/about/versions/nougat/android-7.1">Android 7.1 for
		* Developers</a>.
		*/
		public static final int N_MR1 = 25;

		@@ -799,7 +807,8 @@ public class Build {
		* O.
		*
		* <p>Applications targeting this or a later release will get these
		* new changes in behavior:</p>
		* new changes in behavior. For more information about this release, see
		* the <a href="/about/versions/oreo/">Android Oreo overview</a>.</p>
		* <ul>
		* <li><a href="{@docRoot}about/versions/oreo/background.html">Background execution limits</a>
		* are applied to the application.</li>
		@@ -888,13 +897,16 @@ public class Build {
		* O MR1.
		*
		* <p>Applications targeting this or a later release will get these
		* new changes in behavior:</p>
		* new changes in behavior. For more information about this release, see
		* <a href="/about/versions/oreo/android-8.1">Android 8.1 features and
		* APIs</a>.</p>
		* <ul>
		* <li>Apps exporting and linking to apk shared libraries must explicitly
		* enumerate all signing certificates in a consistent order.</li>
		* <li>{@link android.R.attr#screenOrientation} can not be used to request a fixed
		* orientation if the associated activity is not fullscreen and opaque.</li>
		* </ul>
		*
		*/
		public static final int O_MR1 = 27;

		@@ -902,7 +914,8 @@ public class Build {
		* P.
		*
		* <p>Applications targeting this or a later release will get these
		* new changes in behavior:</p>
		* new changes in behavior. For more information about this release, see the
		* <a href="/about/versions/pie/">Android 9 Pie overview</a>.</p>
		* <ul>
		* <li>{@link android.app.Service#startForeground Service.startForeground} requires
		* that apps hold the permission
		@@ -910,6 +923,7 @@ public class Build {
		* <li>{@link android.widget.LinearLayout} will always remeasure weighted children,
		* even if there is no excess space.</li>
		* </ul>
		*
		*/
		public static final int P = 28;
		}

proto/src/wifi.proto

+30 −0

Original line number	Diff line number	Diff line
		@@ -457,6 +457,8 @@ message WifiLog {
		// Identifier for experimental scoring parameter settings.
		optional string score_experiment_id = 117;

		// Histogram of the EAP method type of all installed Passpoint profiles
		repeated PasspointProfileTypeCount installed_passpoint_profile_type = 123;
		}

		// Information that gets logged for every WiFi connection.
		@@ -1503,3 +1505,31 @@ message WifiRttLog {
		optional int32 count = 2;
		}
		}

		message PasspointProfileTypeCount {
		enum EapMethod {
		// Unknown Type
		TYPE_UNKNOWN = 0;

		// EAP_TLS (13)
		TYPE_EAP_TLS = 1;

		// EAP_TTLS (21)
		TYPE_EAP_TTLS = 2;

		// EAP_SIM (18)
		TYPE_EAP_SIM = 3;

		// EAP_AKA (23)
		TYPE_EAP_AKA = 4;

		// EAP_AKA_PRIME (50)
		TYPE_EAP_AKA_PRIME = 5;
		}

		// Eap method type set in Passpoint profile
		optional EapMethod eap_method_type = 1;

		// Num of installed Passpoint profile with same eap method
		optional int32 count = 2;
		}

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

+3 −4

Original line number	Diff line number	Diff line
		@@ -21952,9 +21952,6 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName());

		//TODO: b/111402650
		private void disableSkuSpecificApps() {
		if (!mIsUpgrade && !mFirstBoot) {
		return;
		}
		String apkList[] = mContext.getResources().getStringArray(
		R.array.config_disableApksUnlessMatchedSku_apk_list);
		String skuArray[] = mContext.getResources().getStringArray(
		@@ -21968,7 +21965,9 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName());
		}
		for (String packageName : apkList) {
		setSystemAppHiddenUntilInstalled(packageName, true);
		setSystemAppInstallState(packageName, false, ActivityManager.getCurrentUser());
		for (UserInfo user : sUserManager.getUsers(false)) {
		setSystemAppInstallState(packageName, false, user.id);
		}
		}
		}