Snap for 7097726 from e643cc6d908f73fbb7a4529e4c3fa785119b5036 to rvc-qpr3-release (d523b41d) · Commits · e / os / android_frameworks_base

data/etc/car/com.android.car.shell.xml

+3 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,9 @@
		~ limitations under the License
		-->
		<permissions>
		<privapp-permissions package="com.android.car.shell">
		<!-- CarShell now overrides the shell package and adding permission here
		is ok. -->
		<privapp-permissions package="com.android.shell">
		<permission name="android.permission.INSTALL_PACKAGES" />
		<permission name="android.permission.MEDIA_CONTENT_CONTROL"/>
		</privapp-permissions>

+20 −2

Original line number	Diff line number	Diff line
		// used both for the android_app and android_library
		shell_srcs = ["src/*/.java",":dumpstate_aidl"]
		shell_static_libs = ["androidx.legacy_legacy-support-v4"]

		android_app {
		name: "Shell",
		srcs: ["src/*/.java",":dumpstate_aidl"],
		srcs: shell_srcs,
		aidl: {
		include_dirs: ["frameworks/native/cmds/dumpstate/binder"],
		},
		static_libs: ["androidx.legacy_legacy-support-v4"],
		static_libs: shell_static_libs,
		platform_apis: true,
		certificate: "platform",
		privileged: true,
		@@ -12,3 +16,17 @@ android_app {
		include_filter: ["com.android.shell.*"],
		},
		}

		// A library for product type like auto to create a new shell package
		// with product specific permissions.
		android_library {
		name: "Shell-package-library",
		srcs: shell_srcs,
		aidl: {
		include_dirs: ["frameworks/native/cmds/dumpstate/binder"],
		},
		resource_dirs: ["res"],
		static_libs: shell_static_libs,
		platform_apis: true,
		manifest: "AndroidManifest.xml",
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -133,7 +133,7 @@ public final class CachedAppOptimizer {
		static final int REPORT_UNFREEZE_MSG = 4;

		//TODO:change this static definition into a configurable flag.
		static final int FREEZE_TIMEOUT_MS = 10000;
		static final long FREEZE_TIMEOUT_MS = 600000;

		static final int DO_FREEZE = 1;
		static final int REPORT_UNFREEZE = 2;

+6 −0

Original line number	Diff line number	Diff line
		@@ -841,6 +841,9 @@ public class GnssLocationProvider extends AbstractLocationProvider implements
		}

		private void injectBestLocation(Location location) {
		if (location.isFromMockProvider()) {
		return;
		}
		if (DEBUG) {
		Log.d(TAG, "injectBestLocation: " + location);
		}
		@@ -942,6 +945,9 @@ public class GnssLocationProvider extends AbstractLocationProvider implements
		}

		private void injectLocation(Location location) {
		if (location.isFromMockProvider()) {
		return;
		}
		if (location.hasAccuracy()) {
		if (DEBUG) {
		Log.d(TAG, "injectLocation: " + location);

+1 −1

Original line number	Diff line number	Diff line
		@@ -4473,7 +4473,7 @@ public class CarrierConfigManager {
		sDefaults.putBoolean(KEY_DISABLE_DUN_APN_WHILE_ROAMING_WITH_PRESET_APN_BOOL, false);
		sDefaults.putString(KEY_DEFAULT_PREFERRED_APN_NAME_STRING, "");
		sDefaults.putBoolean(KEY_USE_LOWER_MTU_VALUE_IF_BOTH_RECEIVED, false);
		sDefaults.putBoolean(KEY_NETWORK_TEMP_NOT_METERED_SUPPORTED_BOOL, false);
		sDefaults.putBoolean(KEY_NETWORK_TEMP_NOT_METERED_SUPPORTED_BOOL, true);
		}

		/**