Snap for 5667572 from 29a2b1109c69bba0f21d9b91e9f221d6e5e840ef to qt-c2f2-release (69d65871) · Commits · e / os / android_frameworks_base

cmds/statsd/src/atoms.proto

+17 −0

Original line number	Diff line number	Diff line
		@@ -305,6 +305,8 @@ message Atom {
		LocationManagerApiUsageReported location_manager_api_usage_reported = 210;
		ReviewPermissionsFragmentResultReported review_permissions_fragment_result_reported
		= 211 [(log_from_module) = "permissioncontroller"];
		RuntimePermissionsUpgradeResult runtime_permissions_upgrade_result =
		212 [(log_from_module) = "permissioncontroller"];
		}

		// Pulled events will start at field 10000.
		@@ -6567,3 +6569,18 @@ message ReviewPermissionsFragmentResultReported {
		// The result of the permission grant
		optional bool permission_granted = 5;
		}

		/**
		* Information about results of permission upgrade by RuntimePermissionsUpgradeController
		* Logged from: RuntimePermissionUpdgradeController
		*/
		message RuntimePermissionsUpgradeResult {
		// Permission granted as result of upgrade
		optional string permission_name = 1;

		// UID of package granted permission
		optional int32 uid = 2 [(is_uid) = true];

		// Name of package granted permission
		optional string package_name = 3;
		}
		No newline at end of file

+6 −5

Original line number	Diff line number	Diff line
		@@ -77,6 +77,7 @@ public abstract class ConditionProviderService extends Service {

		private Provider mProvider;
		private INotificationManager mNoMan;
		boolean mIsConnected;

		/**
		* The {@link Intent} that must be declared as handled by the service.
		@@ -179,7 +180,7 @@ public abstract class ConditionProviderService extends Service {
		try {
		noMan.requestUnbindProvider(mProvider);
		// Disable future messages.
		mProvider = null;
		mIsConnected = false;
		} catch (RemoteException ex) {
		throw ex.rethrowFromSystemServer();
		}
		@@ -233,16 +234,16 @@ public abstract class ConditionProviderService extends Service {
		*/
		@TestApi
		public boolean isBound() {
		if (mProvider == null) {
		if (!mIsConnected) {
		Log.w(TAG, "Condition provider service not yet bound.");
		return false;
		}
		return true;
		return mIsConnected;
		}

		private final class Provider extends IConditionProvider.Stub {
		@Override
		public void onConnected() {
		mIsConnected = true;
		mHandler.obtainMessage(H.ON_CONNECTED).sendToTarget();
		}

		@@ -265,7 +266,7 @@ public abstract class ConditionProviderService extends Service {
		@Override
		public void handleMessage(Message msg) {
		String name = null;
		if (!isBound()) {
		if (!mIsConnected) {
		return;
		}
		try {

+3 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,9 @@
		<!-- Whether or not we show the number in the bar. -->
		<bool name="config_statusBarShowNumber">false</bool>

		<!-- For how long the lock screen can be on before the display turns off. -->
		<integer name="config_lockScreenDisplayTimeout">10000</integer>

		<!-- Vibrator pattern for camera gesture launch. -->
		<integer-array translatable="false" name="config_cameraLaunchGestureVibePattern">
		<item>0</item>

+7 −0

Original line number	Diff line number	Diff line
		@@ -55,9 +55,16 @@ interface ISystemUiProxy {
		/**
		* Control the {@param alpha} of the back button in the navigation bar and {@param animate} if
		* needed from current value
		* @deprecated
		*/
		void setBackButtonAlpha(float alpha, boolean animate) = 8;

		/**
		* Control the {@param alpha} of the option nav bar button (back-button in 2 button mode
		* and home bar in no-button mode) and {@param animate} if needed from current value
		*/
		void setNavBarButtonAlpha(float alpha, boolean animate) = 19;

		/**
		* Proxies motion events from the homescreen UI to the status bar. Only called when
		* swipe down is detected on WORKSPACE. The sender guarantees the following order of events on

+4 −0

Original line number	Diff line number	Diff line
		@@ -365,6 +365,10 @@ public class BatteryMeterView extends LinearLayout implements
		} else {
		setPercentTextAtCurrentLevel();
		}
		} else {
		setContentDescription(
		getContext().getString(mCharging ? R.string.accessibility_battery_level_charging
		: R.string.accessibility_battery_level, mLevel));
		}
		}