Snap for 6338932 from 142d9c83844eb5bd3d321b36d50b1037b9800d83 to mainline-release (889b7e64) · Commits · e / os / android_frameworks_base

Android.bp

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -722,6 +722,7 @@ filegroup {
	srcs: [		srcs: [
	"core/java/android/annotation/StringDef.java",		"core/java/android/annotation/StringDef.java",
	"core/java/android/net/annotations/PolicyDirection.java",		"core/java/android/net/annotations/PolicyDirection.java",
			"core/java/com/android/internal/util/HexDump.java",
	"core/java/com/android/internal/util/IState.java",		"core/java/com/android/internal/util/IState.java",
	"core/java/com/android/internal/util/State.java",		"core/java/com/android/internal/util/State.java",
	"core/java/com/android/internal/util/StateMachine.java",		"core/java/com/android/internal/util/StateMachine.java",

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -39,11 +39,6 @@ INTERNAL_SDK_SOURCE_DIRS := $(addprefix $(LOCAL_PATH)/,$(dirs_to_document))
	$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_API_FILE))		$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_API_FILE))
	$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_SYSTEM_API_FILE))		$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_SYSTEM_API_FILE))
	$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_TEST_API_FILE))		$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_TEST_API_FILE))
	$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_API_FILE):apistubs/android/public/api/android.txt)
	$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_SYSTEM_API_FILE):apistubs/android/system/api/android.txt)
	$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_TEST_API_FILE):apistubs/android/test/api/android.txt)
	$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_MODULE_LIB_API_FILE):apistubs/android/module-lib/api/android.txt)
	$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_SYSTEM_SERVER_API_FILE):apistubs/android/system-server/api/android.txt)

	# sdk.atree needs to copy the whole dir: $(OUT_DOCS)/offline-sdk to the final zip.		# sdk.atree needs to copy the whole dir: $(OUT_DOCS)/offline-sdk to the final zip.
	# So keep offline-sdk-timestamp target here, and unzip offline-sdk-docs.zip to		# So keep offline-sdk-timestamp target here, and unzip offline-sdk-docs.zip to

+20 −0

Original line number	Original line	Diff line number	Diff line
	@@ -115,6 +115,11 @@ droidstubs {
	baseline_file: "api/lint-baseline.txt",		baseline_file: "api/lint-baseline.txt",
	},		},
	},		},
			dist: {
			targets: ["sdk", "win_sdk"],
			dir: "apistubs/android/public/api",
			dest: "android.txt",
			},
	jdiff_enabled: true,		jdiff_enabled: true,
	}		}

	@@ -156,6 +161,11 @@ droidstubs {
	baseline_file: "api/system-lint-baseline.txt",		baseline_file: "api/system-lint-baseline.txt",
	},		},
	},		},
			dist: {
			targets: ["sdk", "win_sdk"],
			dir: "apistubs/android/system/api",
			dest: "android.txt",
			},
	jdiff_enabled: true,		jdiff_enabled: true,
	}		}

	@@ -179,6 +189,11 @@ droidstubs {
	baseline_file: "api/test-lint-baseline.txt",		baseline_file: "api/test-lint-baseline.txt",
	},		},
	},		},
			dist: {
			targets: ["sdk", "win_sdk"],
			dir: "apistubs/android/test/api",
			dest: "android.txt",
			},
	}		}

	/////////////////////////////////////////////////////////////////////		/////////////////////////////////////////////////////////////////////
	@@ -214,6 +229,11 @@ droidstubs {
	baseline_file: "api/module-lib-lint-baseline.txt",		baseline_file: "api/module-lib-lint-baseline.txt",
	},		},
	},		},
			dist: {
			targets: ["sdk", "win_sdk"],
			dir: "apistubs/android/module-lib/api",
			dest: "android.txt",
			},
	}		}

+9 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1353,8 +1353,15 @@ public class BlobStoreManagerService extends SystemService {

	mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DUMP,		mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DUMP,
	"Caller is not allowed to call this; caller=" + Binder.getCallingUid());		"Caller is not allowed to call this; caller=" + Binder.getCallingUid());
			// We post messages back and forth between mHandler thread and mBackgroundHandler
			// thread while committing a blob. We need to replicate the same pattern here to
			// ensure pending messages have been handled.
			mHandler.post(() -> {
			mBackgroundHandler.post(() -> {
	mHandler.post(PooledLambda.obtainRunnable(remoteCallback::sendResult, null)		mHandler.post(PooledLambda.obtainRunnable(remoteCallback::sendResult, null)
	.recycleOnUse());		.recycleOnUse());
			});
			});
	}		}

	@Override		@Override

+3 −6

Original line number	Original line	Diff line number	Diff line
	@@ -84,20 +84,17 @@ droidstubs {
	java_library {		java_library {
	name: "framework-permission-stubs-publicapi",		name: "framework-permission-stubs-publicapi",
	srcs: [ ":framework-permission-stubs-srcs-publicapi" ],		srcs: [ ":framework-permission-stubs-srcs-publicapi" ],
	sdk_version: "system_current",		defaults: ["framework-module-stubs-lib-defaults-publicapi"],
	installable: false,
	}		}

	java_library {		java_library {
	name: "framework-permission-stubs-systemapi",		name: "framework-permission-stubs-systemapi",
	srcs: [ ":framework-permission-stubs-srcs-systemapi" ],		srcs: [ ":framework-permission-stubs-srcs-systemapi" ],
	sdk_version: "system_current",		defaults: ["framework-module-stubs-lib-defaults-systemapi"],
	installable: false,
	}		}

	java_library {		java_library {
	name: "framework-permission-stubs-module_libs_api",		name: "framework-permission-stubs-module_libs_api",
	srcs: [ ":framework-permission-stubs-srcs-module_libs_api" ],		srcs: [ ":framework-permission-stubs-srcs-module_libs_api" ],
	sdk_version: "system_current",		defaults: ["framework-module-stubs-lib-defaults-module_libs_api"],
	installable: false,
	}		}