Snap for 4670666 from b3029a4f72d884bc1931e372a0851a5fdfadf251 to pi-release (992cb80d) · Commits · e / os / android_frameworks_base

Android.bp

+0 −3

Original line number	Diff line number	Diff line
		@@ -169,8 +169,6 @@ java_library {
		"core/java/android/hardware/location/IActivityRecognitionHardwareClient.aidl",
		"core/java/android/hardware/location/IActivityRecognitionHardwareSink.aidl",
		"core/java/android/hardware/location/IActivityRecognitionHardwareWatcher.aidl",
		"core/java/android/hardware/location/IFusedLocationHardware.aidl",
		"core/java/android/hardware/location/IFusedLocationHardwareSink.aidl",
		"core/java/android/hardware/location/IGeofenceHardware.aidl",
		"core/java/android/hardware/location/IGeofenceHardwareCallback.aidl",
		"core/java/android/hardware/location/IGeofenceHardwareMonitorCallback.aidl",
		@@ -409,7 +407,6 @@ java_library {
		"location/java/android/location/IBatchedLocationCallback.aidl",
		"location/java/android/location/ICountryDetector.aidl",
		"location/java/android/location/ICountryListener.aidl",
		"location/java/android/location/IFusedProvider.aidl",
		"location/java/android/location/IGeocodeProvider.aidl",
		"location/java/android/location/IGeofenceProvider.aidl",
		"location/java/android/location/IGnssStatusListener.aidl",

Android.mk

+19 −16

Original line number	Diff line number	Diff line
		@@ -861,39 +861,42 @@ include $(BUILD_STATIC_JAVA_LIBRARY)

		# ==== hiddenapi lists =======================================

		# Copy blacklist and light greylist over into the build folder.
		# Copy light and dark greylist over into the build folder.
		# This is for ART buildbots which need to mock these lists and have alternative
		# rules for building them. Other rules in the build system should depend on the
		# files in the build folder.

		$(eval $(call copy-one-file,frameworks/base/config/hiddenapi-blacklist.txt,\
		$(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST)))

		# Temporarily merge light greylist from two files. Vendor list will become dark
		# grey once we remove the UI toast.
		$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST): frameworks/base/config/hiddenapi-light-greylist.txt \
		frameworks/base/config/hiddenapi-vendor-list.txt
		sort $^ > $@

		$(eval $(call copy-one-file,frameworks/base/config/hiddenapi-dark-greylist.txt,\
		$(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST)))

		# Generate dark greylist as private API minus (blacklist plus light greylist).

		$(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST): PRIVATE_API := $(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE)
		$(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST): BLACKLIST := $(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST)
		$(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST): LIGHT_GREYLIST := $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST)
		$(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST): $(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE) \
		$(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST) \
		$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST)
		if [ ! -z "`comm -12 <(sort $(BLACKLIST)) <(sort $(LIGHT_GREYLIST))`" ]; then \
		echo "There should be no overlap between $(BLACKLIST) and $(LIGHT_GREYLIST)" 1>&2; \
		$(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST): PRIVATE_API := $(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE)
		$(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST): LIGHT_GREYLIST := $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST)
		$(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST): DARK_GREYLIST := $(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST)
		$(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST): $(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE) \
		$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST) \
		$(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST)
		if [ ! -z "`comm -12 <(sort $(LIGHT_GREYLIST)) <(sort $(DARK_GREYLIST))`" ]; then \
		echo "There should be no overlap between $(LIGHT_GREYLIST) and $(DARK_GREYLIST)" 1>&2; \
		comm -12 <(sort $(LIGHT_GREYLIST)) <(sort $(DARK_GREYLIST)) 1>&2; \
		exit 1; \
		elif [ ! -z "`comm -13 <(sort $(PRIVATE_API)) <(sort $(BLACKLIST))`" ]; then \
		echo "$(BLACKLIST) must be a subset of $(PRIVATE_API)" 1>&2; \
		exit 2; \
		elif [ ! -z "`comm -13 <(sort $(PRIVATE_API)) <(sort $(LIGHT_GREYLIST))`" ]; then \
		echo "$(LIGHT_GREYLIST) must be a subset of $(PRIVATE_API)" 1>&2; \
		comm -13 <(sort $(PRIVATE_API)) <(sort $(LIGHT_GREYLIST)) 1>&2; \
		exit 2; \
		elif [ ! -z "`comm -13 <(sort $(PRIVATE_API)) <(sort $(DARK_GREYLIST))`" ]; then \
		echo "$(DARK_GREYLIST) must be a subset of $(PRIVATE_API)" 1>&2; \
		comm -13 <(sort $(PRIVATE_API)) <(sort $(DARK_GREYLIST)) 1>&2; \
		exit 3; \
		fi
		comm -23 <(sort $(PRIVATE_API)) <(sort $(BLACKLIST) $(LIGHT_GREYLIST)) > $@
		comm -23 <(sort $(PRIVATE_API)) <(sort $(LIGHT_GREYLIST) $(DARK_GREYLIST)) > $@

		# Include subdirectory makefiles
		# ============================================================

apct-tests/perftests/core/src/android/os/BinderCallsStatsPerfTest.java

0 → 100644

+79 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 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
		*/

		package android.os;

		import android.perftests.utils.BenchmarkState;
		import android.perftests.utils.PerfStatusReporter;
		import android.support.test.filters.LargeTest;
		import android.support.test.runner.AndroidJUnit4;

		import com.android.internal.os.BinderCallsStats;

		import org.junit.After;
		import org.junit.Before;
		import org.junit.Rule;
		import org.junit.Test;
		import org.junit.runner.RunWith;

		import static org.junit.Assert.assertNull;


		/**
		* Performance tests for {@link BinderCallsStats}
		*/
		@RunWith(AndroidJUnit4.class)
		@LargeTest
		public class BinderCallsStatsPerfTest {

		@Rule
		public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter();
		private BinderCallsStats mBinderCallsStats;

		@Before
		public void setUp() {
		mBinderCallsStats = new BinderCallsStats(true);
		}

		@After
		public void tearDown() {
		}

		@Test
		public void timeCallSession() {
		final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
		Binder b = new Binder();
		int i = 0;
		while (state.keepRunning()) {
		BinderCallsStats.CallSession s = mBinderCallsStats.callStarted(b, i % 100);
		mBinderCallsStats.callEnded(s);
		i++;
		}
		}

		@Test
		public void timeCallSessionTrackingDisabled() {
		final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
		Binder b = new Binder();
		mBinderCallsStats = new BinderCallsStats(false);
		assertNull(mBinderCallsStats.callStarted(b, 0));
		while (state.keepRunning()) {
		BinderCallsStats.CallSession s = mBinderCallsStats.callStarted(b, 0);
		mBinderCallsStats.callEnded(s);
		}
		}

		}

api/current.txt

+10 −15

Original line number	Diff line number	Diff line
		@@ -6559,7 +6559,7 @@ package android.app.admin {
		method public void setLockTaskPackages(android.content.ComponentName, java.lang.String[]) throws java.lang.SecurityException;
		method public void setLogoutEnabled(android.content.ComponentName, boolean);
		method public void setLongSupportMessage(android.content.ComponentName, java.lang.CharSequence);
		method public void setMandatoryBackupTransport(android.content.ComponentName, android.content.ComponentName);
		method public boolean setMandatoryBackupTransport(android.content.ComponentName, android.content.ComponentName);
		method public void setMasterVolumeMuted(android.content.ComponentName, boolean);
		method public void setMaximumFailedPasswordsForWipe(android.content.ComponentName, int);
		method public void setMaximumTimeToLock(android.content.ComponentName, long);
		@@ -7193,6 +7193,7 @@ package android.app.slice {
		field public static final deprecated java.lang.String EXTRA_SLIDER_VALUE = "android.app.slice.extra.SLIDER_VALUE";
		field public static final java.lang.String EXTRA_TOGGLE_STATE = "android.app.slice.extra.TOGGLE_STATE";
		field public static final java.lang.String HINT_ACTIONS = "actions";
		field public static final java.lang.String HINT_ERROR = "error";
		field public static final java.lang.String HINT_HORIZONTAL = "horizontal";
		field public static final java.lang.String HINT_KEY_WORDS = "key_words";
		field public static final java.lang.String HINT_LARGE = "large";
		@@ -7218,29 +7219,22 @@ package android.app.slice {
		}

		public static class Slice.Builder {
		ctor public Slice.Builder(android.net.Uri);
		ctor public deprecated Slice.Builder(android.net.Uri);
		ctor public Slice.Builder(android.net.Uri, android.app.slice.SliceSpec);
		ctor public Slice.Builder(android.app.slice.Slice.Builder);
		method public android.app.slice.Slice.Builder addAction(android.app.PendingIntent, android.app.slice.Slice);
		method public android.app.slice.Slice.Builder addAction(android.app.PendingIntent, android.app.slice.Slice, java.lang.String);
		method public android.app.slice.Slice.Builder addBundle(android.os.Bundle, java.lang.String, java.lang.String...);
		method public android.app.slice.Slice.Builder addBundle(android.os.Bundle, java.lang.String, java.util.List<java.lang.String>);
		method public android.app.slice.Slice.Builder addHints(java.lang.String...);
		method public android.app.slice.Slice.Builder addHints(java.util.List<java.lang.String>);
		method public android.app.slice.Slice.Builder addIcon(android.graphics.drawable.Icon, java.lang.String, java.lang.String...);
		method public android.app.slice.Slice.Builder addIcon(android.graphics.drawable.Icon, java.lang.String, java.util.List<java.lang.String>);
		method public android.app.slice.Slice.Builder addInt(int, java.lang.String, java.lang.String...);
		method public android.app.slice.Slice.Builder addInt(int, java.lang.String, java.util.List<java.lang.String>);
		method public android.app.slice.Slice.Builder addLong(long, java.lang.String, java.util.List<java.lang.String>);
		method public android.app.slice.Slice.Builder addRemoteInput(android.app.RemoteInput, java.lang.String, java.util.List<java.lang.String>);
		method public android.app.slice.Slice.Builder addRemoteInput(android.app.RemoteInput, java.lang.String, java.lang.String...);
		method public android.app.slice.Slice.Builder addSubSlice(android.app.slice.Slice);
		method public android.app.slice.Slice.Builder addSubSlice(android.app.slice.Slice, java.lang.String);
		method public android.app.slice.Slice.Builder addText(java.lang.CharSequence, java.lang.String, java.lang.String...);
		method public android.app.slice.Slice.Builder addText(java.lang.CharSequence, java.lang.String, java.util.List<java.lang.String>);
		method public android.app.slice.Slice.Builder addTimestamp(long, java.lang.String, java.lang.String...);
		method public android.app.slice.Slice.Builder addTimestamp(long, java.lang.String, java.util.List<java.lang.String>);
		method public deprecated android.app.slice.Slice.Builder addTimestamp(long, java.lang.String, java.util.List<java.lang.String>);
		method public android.app.slice.Slice build();
		method public android.app.slice.Slice.Builder setCallerNeeded(boolean);
		method public android.app.slice.Slice.Builder setSpec(android.app.slice.SliceSpec);
		method public deprecated android.app.slice.Slice.Builder setSpec(android.app.slice.SliceSpec);
		}

		public final class SliceItem implements android.os.Parcelable {
		@@ -7263,10 +7257,11 @@ package android.app.slice {
		field public static final java.lang.String FORMAT_BUNDLE = "bundle";
		field public static final java.lang.String FORMAT_IMAGE = "image";
		field public static final java.lang.String FORMAT_INT = "int";
		field public static final java.lang.String FORMAT_LONG = "long";
		field public static final java.lang.String FORMAT_REMOTE_INPUT = "input";
		field public static final java.lang.String FORMAT_SLICE = "slice";
		field public static final java.lang.String FORMAT_TEXT = "text";
		field public static final java.lang.String FORMAT_TIMESTAMP = "timestamp";
		field public static final deprecated java.lang.String FORMAT_TIMESTAMP = "long";
		}

		public class SliceManager {
		@@ -51597,7 +51592,6 @@ package android.webkit {
		field public static final int CATEGORIES_WEB_DEVELOPER = 4; // 0x4
		field public static final int RECORD_CONTINUOUSLY = 1; // 0x1
		field public static final int RECORD_UNTIL_FULL = 0; // 0x0
		field public static final int RECORD_UNTIL_FULL_LARGE_BUFFER = 2; // 0x2
		}

		public static class TracingConfig.Builder {
		@@ -52004,6 +51998,7 @@ package android.webkit {
		method public android.webkit.WebChromeClient getWebChromeClient();
		method public static java.lang.ClassLoader getWebViewClassLoader();
		method public android.webkit.WebViewClient getWebViewClient();
		method public android.os.Looper getWebViewLooper();
		method public void goBack();
		method public void goBackOrForward(int);
		method public void goForward();

api/system-current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -725,6 +725,8 @@ package android.app.usage {
		method public java.lang.String getNotificationChannelId();
		field public static final int NOTIFICATION_INTERRUPTION = 12; // 0xc
		field public static final int NOTIFICATION_SEEN = 10; // 0xa
		field public static final int SLICE_PINNED = 14; // 0xe
		field public static final int SLICE_PINNED_PRIV = 13; // 0xd
		field public static final int SYSTEM_INTERACTION = 6; // 0x6
		}

		@@ -3065,8 +3067,10 @@ package android.net {
		}

		public static final class IpSecManager.IpSecTunnelInterface implements java.lang.AutoCloseable {
		method public void addAddress(android.net.LinkAddress) throws java.io.IOException;
		method public void close();
		method public java.lang.String getInterfaceName();
		method public void removeAddress(android.net.LinkAddress) throws java.io.IOException;
		}

		public final class IpSecTransform implements java.lang.AutoCloseable {