Snap for 7249665 from 7ff8faf4aff130b304127772fa6b439f86ec0e8d to sc-release (018c76f5) · Commits · e / os / android_frameworks_base

Android.bp

+0 −288

Original line number	Diff line number	Diff line
		@@ -98,274 +98,6 @@ license {
		],
		}

		filegroup {
		name: "framework-core-sources",
		srcs: [
		"core/java/*/.java",
		"core/java/*/.aidl",
		],
		path: "core/java",
		}

		// These are subset of framework-core-sources that are needed by the
		// android.test.mock library. The implementation of android.test.mock references
		// private members of various components to allow mocking of classes that cannot
		// be mocked without access to those internal implementation details.
		filegroup {
		name: "framework-core-sources-for-test-mock",
		srcs: [
		"core/java/android/accounts/AccountManagerCallback.java",
		"core/java/android/accounts/AccountManagerFuture.java",
		"core/java/android/accounts/AccountManager.java",
		"core/java/android/accounts/AccountsException.java",
		"core/java/android/accounts/AuthenticatorException.java",
		"core/java/android/accounts/OperationCanceledException.java",
		"core/java/android/annotation/AnimatorRes.java",
		"core/java/android/annotation/AnimRes.java",
		"core/java/android/annotation/AnyRes.java",
		"core/java/android/annotation/ArrayRes.java",
		"core/java/android/annotation/AttrRes.java",
		"core/java/android/annotation/BoolRes.java",
		"core/java/android/annotation/BroadcastBehavior.java",
		"core/java/android/annotation/CallbackExecutor.java",
		"core/java/android/annotation/CallSuper.java",
		"core/java/android/annotation/CheckResult.java",
		"core/java/android/annotation/ColorInt.java",
		"core/java/android/annotation/ColorRes.java",
		"core/java/android/annotation/DimenRes.java",
		"core/java/android/annotation/DrawableRes.java",
		"core/java/android/annotation/FontRes.java",
		"core/java/android/annotation/FractionRes.java",
		"core/java/android/annotation/IntDef.java",
		"core/java/android/annotation/IntegerRes.java",
		"core/java/android/annotation/IntRange.java",
		"core/java/android/annotation/LayoutRes.java",
		"core/java/android/annotation/NonNull.java",
		"core/java/android/annotation/Nullable.java",
		"core/java/android/annotation/PluralsRes.java",
		"core/java/android/annotation/RawRes.java",
		"core/java/android/annotation/RequiresPermission.java",
		"core/java/android/annotation/SdkConstant.java",
		"core/java/android/annotation/Size.java",
		"core/java/android/annotation/StringDef.java",
		"core/java/android/annotation/StringRes.java",
		"core/java/android/annotation/StyleableRes.java",
		"core/java/android/annotation/StyleRes.java",
		"core/java/android/annotation/SuppressLint.java",
		"core/java/android/annotation/SystemApi.java",
		"core/java/android/annotation/SystemService.java",
		"core/java/android/annotation/TestApi.java",
		"core/java/android/annotation/UserIdInt.java",
		"core/java/android/annotation/XmlRes.java",
		"core/java/android/app/Application.java",
		"core/java/android/app/IApplicationThread.aidl",
		"core/java/android/app/IServiceConnection.aidl",
		"core/java/android/app/PackageDeleteObserver.java",
		"core/java/android/content/ComponentCallbacks2.java",
		"core/java/android/content/ComponentCallbacks.java",
		"core/java/android/content/ContentInterface.java",
		"core/java/android/content/ContentProvider.java",
		"core/java/android/content/ContentProviderNative.java",
		"core/java/android/content/ContentResolver.java",
		"core/java/android/content/Context.java",
		"core/java/android/content/ContextWrapper.java",
		"core/java/android/content/DialogInterface.java",
		"core/java/android/content/IContentProvider.java",
		"core/java/android/content/Intent.java",
		"core/java/android/content/IntentSender.java",
		"core/java/android/content/OperationApplicationException.java",
		"core/java/android/content/pm/ActivityInfo.java",
		"core/java/android/content/pm/ApplicationInfo.java",
		"core/java/android/content/pm/InstantAppInfo.java",
		"core/java/android/content/pm/IPackageDataObserver.aidl",
		"core/java/android/content/pm/KeySet.java",
		"core/java/android/content/pm/PackageManager.java",
		"core/java/android/content/pm/VerifierDeviceIdentity.java",
		"core/java/android/content/res/Resources.java",
		"core/java/android/database/CrossProcessCursor.java",
		"core/java/android/database/CrossProcessCursorWrapper.java",
		"core/java/android/database/Cursor.java",
		"core/java/android/database/CursorWrapper.java",
		"core/java/android/os/Binder.java",
		"core/java/android/os/Bundle.java",
		"core/java/android/os/IBinder.java",
		"core/java/android/os/IInterface.java",
		"core/java/android/os/Parcelable.java",
		"core/java/android/os/ParcelFileDescriptor.java",
		"core/java/android/os/RemoteException.java",
		"core/java/android/os/storage/VolumeInfo.java",
		"core/java/android/util/AndroidException.java",
		"core/java/android/view/DisplayAdjustments.java",
		"core/java/android/view/ViewDebug.java",
		"core/java/com/android/internal/annotations/VisibleForTesting.java",
		],
		path: "core/java",
		visibility: ["//frameworks/base/test-mock"],
		}

		filegroup {
		name: "framework-drm-sources",
		srcs: [
		"drm/java/*/.java",
		],
		path: "drm/java",
		}

		filegroup {
		name: "framework-graphics-nonupdatable-sources",
		srcs: [
		"graphics/java/*/.java",
		"graphics/java/*/.aidl",
		],
		path: "graphics/java",
		}

		filegroup {
		name: "framework-identity-sources",
		srcs: [
		"identity/java/*/.java",
		],
		path: "identity/java",
		}

		filegroup {
		name: "framework-keystore-sources",
		srcs: [
		"keystore/java/*/.java",
		"keystore/java/*/.aidl",
		],
		path: "keystore/java",
		}

		filegroup {
		name: "framework-location-sources",
		srcs: [
		"location/java/*/.java",
		"location/java/*/.aidl",
		],
		path: "location/java",
		}

		filegroup {
		name: "framework-lowpan-sources",
		srcs: [
		"lowpan/java/*/.java",
		"lowpan/java/*/.aidl",
		],
		path: "lowpan/java",
		}

		filegroup {
		name: "framework-media-sources",
		srcs: [
		"media/java/*/.java",
		"media/java/*/.aidl",
		],
		exclude_srcs: [
		":framework-media-tv-tunerresourcemanager-sources-aidl",
		],
		path: "media/java",
		}

		filegroup {
		name: "framework-mca-effect-sources",
		srcs: [
		"media/mca/effect/java/*/.java",
		],
		path: "media/mca/effect/java",
		}

		filegroup {
		name: "framework-mca-filterfw-sources",
		srcs: [
		"media/mca/filterfw/java/*/.java",
		],
		path: "media/mca/filterfw/java",
		}

		filegroup {
		name: "framework-mca-filterpacks-sources",
		srcs: [
		"media/mca/filterpacks/java/*/.java",
		],
		path: "media/mca/filterpacks/java",
		}

		filegroup {
		name: "framework-mime-sources",
		srcs: [
		"mime/java/*/.java",
		],
		path: "mime/java",
		}

		filegroup {
		name: "framework-opengl-sources",
		srcs: [
		"opengl/java/*/.java",
		],
		path: "opengl/java",
		}

		filegroup {
		name: "framework-rs-sources",
		srcs: [
		"rs/java/*/.java",
		],
		path: "rs/java",
		}

		filegroup {
		name: "framework-sax-sources",
		srcs: [
		"sax/java/*/.java",
		],
		path: "sax/java",
		}

		filegroup {
		name: "framework-telecomm-sources",
		srcs: [
		"telecomm/java/*/.java",
		"telecomm/java/*/.aidl",
		],
		path: "telecomm/java",
		}

		filegroup {
		name: "framework-telephony-sources",
		srcs: [
		"telephony/java/*/.java",
		"telephony/java/*/.aidl",
		],
		path: "telephony/java",
		}

		genrule {
		name: "statslog-telephony-common-java-gen",
		tools: ["stats-log-api-gen"],
		cmd: "$(location stats-log-api-gen) --java $(out) --module telephony_common" +
		" --javaPackage com.android.internal.telephony --javaClass TelephonyCommonStatsLog",
		out: ["com/android/internal/telephony/TelephonyCommonStatsLog.java"],
		}

		filegroup {
		name: "framework-telephony-common-sources",
		srcs: [
		"telephony/common/*/.java",
		":statslog-telephony-common-java-gen",
		],
		}

		filegroup {
		name: "framework-mms-sources",
		srcs: [
		"mms/java/*/.java",
		"mms/java/*/.aidl",
		],
		path: "mms/java",
		}

		filegroup {
		name: "framework-non-updatable-sources",
		srcs: [
		@@ -441,26 +173,6 @@ filegroup {
		],
		}

		filegroup {
		name: "framework-updatable-sources",
		srcs: [
		":framework-appsearch-sources",
		":framework-connectivity-sources",
		":framework-graphics-srcs",
		":framework-mediaprovider-sources",
		":framework-permission-sources",
		":framework-permission-s-sources",
		":framework-scheduling-sources",
		":framework-sdkextensions-sources",
		":framework-statsd-sources",
		":framework-tethering-srcs",
		":framework-wifi-updatable-sources",
		":ike-srcs",
		":updatable-media-srcs",
		],
		visibility: ["//visibility:private"],
		}

		java_library {
		name: "framework-updatable-stubs-module_libs_api",
		static_libs: [

ApiDocs.bp

+18 −2

Original line number	Diff line number	Diff line
		@@ -59,11 +59,27 @@ stubs_defaults {
		name: "framework-doc-stubs-default",
		srcs: [
		":framework-non-updatable-stub-sources",
		":framework-updatable-sources",
		"test-base/src/*/.java",

		// Module sources
		":art.module.public.api{.public.stubs.source}",
		":conscrypt.module.public.api{.public.stubs.source}",
		":framework-appsearch-sources",
		":framework-connectivity-sources",
		":framework-graphics-srcs",
		":framework-mediaprovider-sources",
		":framework-permission-sources",
		":framework-permission-s-sources",
		":framework-scheduling-sources",
		":framework-sdkextensions-sources",
		":framework-statsd-sources",
		":framework-tethering-srcs",
		":framework-wifi-updatable-sources",
		":i18n.module.public.api{.public.stubs.source}",
		":ike-srcs",
		":updatable-media-srcs",

		// No longer part of the stubs, but are included in the docs.
		"test-base/src/*/.java",
		"test-mock/src/*/.java",
		"test-runner/src/*/.java",
		],

apex/appsearch/service/java/com/android/server/appsearch/AppSearchManagerService.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -160,7 +160,7 @@ public class AppSearchManagerService extends SystemService {
		Preconditions.checkNotNull(packageName);
		Preconditions.checkNotNull(databaseName);
		Preconditions.checkNotNull(callback);
		int callingUid = Binder.getCallingUidOrThrow();
		int callingUid = Binder.getCallingUid();
		int callingUserId = handleIncomingUser(userId, callingUid);
		final long callingIdentity = Binder.clearCallingIdentity();
		try {
		@@ -187,7 +187,7 @@ public class AppSearchManagerService extends SystemService {
		Preconditions.checkNotNull(packageName);
		Preconditions.checkNotNull(databaseName);
		Preconditions.checkNotNull(callback);
		int callingUid = Binder.getCallingUidOrThrow();
		int callingUid = Binder.getCallingUid();
		int callingUserId = handleIncomingUser(userId, callingUid);
		final long callingIdentity = Binder.clearCallingIdentity();
		try {

apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -472,8 +472,7 @@ public class AlarmManagerService extends SystemService {
		private static final long DEFAULT_ALLOW_WHILE_IDLE_WINDOW = 60 * 60 * 1000; // 1 hour.
		private static final long DEFAULT_ALLOW_WHILE_IDLE_COMPAT_WINDOW = 9 * 60 * 1000; // 9 mins.

		// TODO (b/171306433): Change to true by default.
		private static final boolean DEFAULT_CRASH_NON_CLOCK_APPS = false;
		private static final boolean DEFAULT_CRASH_NON_CLOCK_APPS = true;

		private static final long DEFAULT_PRIORITY_ALARM_DELAY = 9 * 60_000;

apex/jobscheduler/service/java/com/android/server/job/controllers/ConnectivityController.java

+17 −9

Original line number	Diff line number	Diff line
		@@ -167,7 +167,7 @@ public final class ConnectivityController extends RestrictingController implemen
		*/
		private final List<UidStats> mSortedStats = new ArrayList<>();

		private static final int MSG_REEVALUATE_JOBS = 2;
		private static final int MSG_ADJUST_CALLBACKS = 0;

		private final Handler mHandler;

		@@ -230,7 +230,7 @@ public final class ConnectivityController extends RestrictingController implemen
		uidStats.numRunning--;
		}
		maybeRevokeStandbyExceptionLocked(jobStatus);
		maybeAdjustRegisteredCallbacksLocked();
		postAdjustCallbacks();
		}
		}

		@@ -451,7 +451,7 @@ public final class ConnectivityController extends RestrictingController implemen
		mUidStats.removeAt(u);
		}
		}
		maybeAdjustRegisteredCallbacksLocked();
		postAdjustCallbacks();
		}

		private boolean isUsable(NetworkCapabilities capabilities) {
		@@ -598,8 +598,7 @@ public final class ConnectivityController extends RestrictingController implemen
		mSortedStats.add(uidStats);
		}
		if (mCurrentDefaultNetworkCallbacks.size() >= MAX_NETWORK_CALLBACKS) {
		// TODO: offload to handler
		maybeAdjustRegisteredCallbacksLocked();
		postAdjustCallbacks();
		return;
		}
		registerPendingUidCallbacksLocked();
		@@ -632,14 +631,21 @@ public final class ConnectivityController extends RestrictingController implemen
		}
		}

		private void postAdjustCallbacks() {
		mHandler.obtainMessage(MSG_ADJUST_CALLBACKS).sendToTarget();
		}

		@GuardedBy("mLock")
		private void maybeAdjustRegisteredCallbacksLocked() {
		mHandler.removeMessages(MSG_ADJUST_CALLBACKS);

		final int count = mUidStats.size();
		if (count == mCurrentDefaultNetworkCallbacks.size()) {
		// All of them are registered and there are no blocked UIDs.
		// No point evaluating all UIDs.
		return;
		}

		final long nowElapsed = sElapsedRealtimeClock.millis();
		mSortedStats.clear();

		@@ -898,7 +904,7 @@ public final class ConnectivityController extends RestrictingController implemen
		synchronized (mLock) {
		mAvailableNetworks.put(network, capabilities);
		updateTrackedJobsLocked(-1, network);
		maybeAdjustRegisteredCallbacksLocked();
		postAdjustCallbacks();
		}
		}

		@@ -916,7 +922,7 @@ public final class ConnectivityController extends RestrictingController implemen
		}
		}
		updateTrackedJobsLocked(-1, network);
		maybeAdjustRegisteredCallbacksLocked();
		postAdjustCallbacks();
		}
		}
		};
		@@ -930,8 +936,10 @@ public final class ConnectivityController extends RestrictingController implemen
		public void handleMessage(Message msg) {
		synchronized (mLock) {
		switch (msg.what) {
		case MSG_REEVALUATE_JOBS:
		updateTrackedJobsLocked(-1, null);
		case MSG_ADJUST_CALLBACKS:
		synchronized (mLock) {
		maybeAdjustRegisteredCallbacksLocked();
		}
		break;
		}
		}