Snap for 6520394 from fa51f110950aa0cc134a8e9aec5e93927213bc13 to rvc-release (11fddcf6) · Commits · e / os / android_packages_apps_PackageInstaller

res/layout-television/grant_permissions.xml

+7 −0

Original line number	Diff line number	Diff line
		@@ -73,6 +73,13 @@
		android:text="@string/grant_dialog_button_allow"
		style="@style/GrantPermissions.ActionItem" />

		<Button
		android:id="@+id/permission_allow_one_time_button"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:text="@string/grant_dialog_button_allow_one_time"
		style="@style/GrantPermissions.ActionItem" />

		<Button
		android:id="@+id/permission_deny_button"
		android:layout_width="match_parent"

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ import java.io.File
		* Like {@link Log} but stores the logs in a file which can later be dumped via {@link #dump}
		*/
		object DumpableLog {
		private const val MAX_FILE_SIZE = 32 * 1024
		private const val MAX_FILE_SIZE = 64 * 1024

		private val lock = Any()
		private val file = File(PermissionControllerApplication.get().filesDir, LOGS_TO_DUMP_FILE)

+1 −0

Original line number	Diff line number	Diff line
		@@ -293,6 +293,7 @@ class AppPermGroupUiInfoLiveData private constructor(

		if (isSpecialLocation) {
		LocationUtils.addLocationListener(this)
		updateIfActive()
		}
		}

+5 −5

Original line number	Diff line number	Diff line
		@@ -30,10 +30,6 @@ import java.util.concurrent.TimeUnit
		*/
		abstract class DataRepository<K, V : DataRepository.InactiveTimekeeper> : ComponentCallbacks2 {

		init {
		PermissionControllerApplication.get().registerComponentCallbacks(this)
		}

		/**
		* Deadlines for removal based on memory pressure. Live Data objects which have been inactive
		* for longer than the deadline will be removed.
		@@ -42,9 +38,9 @@ abstract class DataRepository<K, V : DataRepository.InactiveTimekeeper> : Compon
		private val TIME_THRESHOLD_TIGHT_NANOS: Long = TimeUnit.NANOSECONDS.convert(1, TimeUnit.MINUTES)
		private val TIME_THRESHOLD_ALL_NANOS: Long = 0

		protected val lock = Any()
		@GuardedBy("lock")
		protected val data = mutableMapOf<K, V>()
		protected val lock = Any()

		/**
		* Whether or not this data repository has been registered as a component callback yet
		@@ -56,6 +52,10 @@ abstract class DataRepository<K, V : DataRepository.InactiveTimekeeper> : Compon
		private var isLowMemoryDevice = PermissionControllerApplication.get().getSystemService(
		ActivityManager::class.java)?.isLowRamDevice ?: false

		init {
		PermissionControllerApplication.get().registerComponentCallbacks(this)
		}

		/**
		* Get a value from this repository, creating it if needed
		*

+1 −0

Original line number	Diff line number	Diff line
		@@ -185,6 +185,7 @@ class LightAppPermGroupLiveData private constructor(

		if (isSpecialLocation) {
		LocationUtils.addLocationListener(this)
		updateIfActive()
		}
		}