Merge branch '3571-a14-sept' into 'v3.1-a14' (3974b9b5) · Commits · e / os / android_frameworks_base

core/java/android/app/admin/DeviceAdminInfo.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -397,6 +397,8 @@ public final class DeviceAdminInfo implements Parcelable {
		} catch (NameNotFoundException e) {
		throw new XmlPullParserException(
		"Unable to create context for: " + mActivityInfo.packageName);
		} catch (OutOfMemoryError e) {
		throw new XmlPullParserException("Out of memory when parsing", null, e);
		} finally {
		if (parser != null) parser.close();
		}

+7 −0

Original line number	Diff line number	Diff line
		@@ -233,6 +233,8 @@ public final class AssociationRequest implements Parcelable {
		*/
		private boolean mSkipPrompt;

		private static final int DISPLAY_NAME_LENGTH_LIMIT = 1024;

		/**
		* Creates a new AssociationRequest.
		*
		@@ -419,6 +421,11 @@ public final class AssociationRequest implements Parcelable {
		public Builder setDisplayName(@NonNull CharSequence displayName) {
		checkNotUsed();
		mDisplayName = requireNonNull(displayName);
		if (displayName.length() > DISPLAY_NAME_LENGTH_LIMIT) {
		throw new IllegalArgumentException("Length of the display name must be at most "
		+ DISPLAY_NAME_LENGTH_LIMIT + " characters");
		}

		return this;
		}

+8 −36

Original line number	Diff line number	Diff line
		@@ -59,7 +59,7 @@ genrule {
		name: "generate_priv_manifest",
		srcs: [
		"shim_priv/AndroidManifest.xml",
		":CtsShimPrivUpgrade",
		":CtsShimPrivUpgrade"
		],
		out: ["AndroidManifest.xml"],
		cmd: "sed -e s/__HASH__/`sha512sum -b $(location :CtsShimPrivUpgrade) \| cut -d' ' -f1`/ $(location shim_priv/AndroidManifest.xml) > $(out)",
		@@ -152,34 +152,6 @@ android_app {
		],
		}

		//##########################################################
		// Variant: System app upgrade

		android_app {
		name: "CtsShimUpgrade",

		sdk_version: "current",
		optimize: {
		enabled: false,
		},
		dex_preopt: {
		enabled: false,
		},

		manifest: "shim/AndroidManifestUpgrade.xml",
		min_sdk_version: "24",
		}

		genrule {
		name: "generate_shim_manifest",
		srcs: [
		"shim/AndroidManifest.xml",
		":CtsShimUpgrade",
		],
		out: ["AndroidManifest.xml"],
		cmd: "sed -e s/__HASH__/`sha512sum -b $(location :CtsShimUpgrade) \| cut -d' ' -f1`/ $(location shim/AndroidManifest.xml) > $(out)",
		}

		//##########################################################
		// Variant: System app

		@@ -194,7 +166,7 @@ android_app {
		enabled: false,
		},

		manifest: ":generate_shim_manifest",
		manifest: "shim/AndroidManifest.xml",
		apex_available: [
		"//apex_available:platform",
		"com.android.apex.cts.shim.v1",

+3 −5

Original line number	Diff line number	Diff line
		@@ -17,15 +17,13 @@
		<!-- Manifest for the system CTS shim -->
		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:tools="http://schemas.android.com/tools"
		package="com.android.cts.ctsshim"
		android:sharedUserId="com.android.cts.ctsshim" >
		package="com.android.cts.ctsshim" >

		<uses-sdk
		android:minSdkVersion="24"
		<uses-sdk android:minSdkVersion="24"
		android:targetSdkVersion="28" />

		<restrict-update
		android:hash="__HASH__" />
		android:hash="__CAN_NOT_BE_UPDATED__" />

		<application
		android:hasCode="false"

deleted100644 → 0

+0 −30

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2016 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<!-- Manifest for the system CTS shim -->
		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:tools="http://schemas.android.com/tools"
		package="com.android.cts.ctsshim" >

		<uses-sdk
		android:minSdkVersion="24"
		android:targetSdkVersion="28" />

		<application
		android:hasCode="false"
		tools:ignore="AllowBackup,MissingApplicationIcon" />
		</manifest>