Snap for 6736586 from e2a535da8ae862286b6e693d76474b24a16ae806 to rvc-qpr1-release (47088491) · Commits · e / os / android_frameworks_base

cmds/uiautomator/library/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@ java_library_static {
		"android.test.runner",
		"junit",
		],
		java_version: "1.8",
		}

		java_library_static {

core/java/android/app/LoadedApk.java

+30 −6

Original line number	Diff line number	Diff line
		@@ -802,12 +802,9 @@ public final class LoadedApk {

		makePaths(mActivityThread, isBundledApp, mApplicationInfo, zipPaths, libPaths);

		String libraryPermittedPath = mDataDir;
		if (mActivityThread == null) {
		// In a zygote context where mActivityThread is null we can't access the app data dir
		// and including this in libraryPermittedPath would cause SELinux denials.
		libraryPermittedPath = "";
		}
		// Including an inaccessible dir in libraryPermittedPath would cause SELinux denials
		// when the loader attempts to canonicalise the path. so we don't.
		String libraryPermittedPath = canAccessDataDir() ? mDataDir : "";

		if (isBundledApp) {
		// For bundled apps, add the base directory of the app (e.g.,
		@@ -951,6 +948,33 @@ public final class LoadedApk {
		}
		}

		/**
		* Return whether we can access the package's private data directory in order to be able to
		* load code from it.
		*/
		private boolean canAccessDataDir() {
		// In a zygote context where mActivityThread is null we can't access the app data dir.
		if (mActivityThread == null) {
		return false;
		}

		// A package can access its own data directory (the common case, so short-circuit it).
		if (Objects.equals(mPackageName, ActivityThread.currentPackageName())) {
		return true;
		}

		// Temporarily disable logging of disk reads on the Looper thread as this is necessary -
		// and the loader will access the directory anyway if we don't check it.
		StrictMode.ThreadPolicy oldPolicy = allowThreadDiskReads();
		try {
		// We are constructing a classloader for a different package. It is likely,
		// but not certain, that we can't acccess its app data dir - so check.
		return new File(mDataDir).canExecute();
		} finally {
		setThreadPolicy(oldPolicy);
		}
		}

		@UnsupportedAppUsage
		public ClassLoader getClassLoader() {
		synchronized (this) {

core/java/android/view/accessibility/AccessibilityNodeInfo.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -1768,7 +1768,7 @@ public class AccessibilityNodeInfo implements Parcelable {
		* <strong>Note:</strong> The primary usage of this API is for UI test automation
		* and in order to report the fully qualified view id if an {@link AccessibilityNodeInfo}
		* the client has to set the {@link AccessibilityServiceInfo#FLAG_REPORT_VIEW_IDS}
		* flag when configuring their {@link android.accessibilityservice.AccessibilityService}.
		* flag when configuring the {@link android.accessibilityservice.AccessibilityService}.
		* </p>
		* <p>
		* <strong>Note:</strong> If this view hierarchy has a {@link SurfaceView} embedding another
		@@ -3206,7 +3206,7 @@ public class AccessibilityNodeInfo implements Parcelable {
		* <strong>Note:</strong> The primary usage of this API is for UI test automation
		* and in order to report the source view id of an {@link AccessibilityNodeInfo} the
		* client has to set the {@link AccessibilityServiceInfo#FLAG_REPORT_VIEW_IDS}
		* flag when configuring their {@link android.accessibilityservice.AccessibilityService}.
		* flag when configuring the {@link android.accessibilityservice.AccessibilityService}.
		* </p>

		* @return The id resource name.

packages/SettingsLib/res/values-af/strings.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -257,7 +257,6 @@
		<string name="bluetooth_show_devices_without_names" msgid="923584526471885819">"Wys Bluetooth-toestelle sonder name"</string>
		<string name="bluetooth_disable_absolute_volume" msgid="1452342324349203434">"Deaktiveer absolute volume"</string>
		<string name="bluetooth_enable_gabeldorsche" msgid="9131730396242883416">"Aktiveer Gabeldorsche"</string>
		<string name="enhanced_connectivity" msgid="7201127377781666804">"Verbeterde konnektiwiteit"</string>
		<string name="bluetooth_select_avrcp_version_string" msgid="1710571610177659127">"Bluetooth AVRCP-weergawe"</string>
		<string name="bluetooth_select_avrcp_version_dialog_title" msgid="7846922290083709633">"Kies Bluetooth AVRCP-weergawe"</string>
		<string name="bluetooth_select_map_version_string" msgid="526308145174175327">"Bluetooth MAP-weergawe"</string>

packages/SettingsLib/res/values-am/strings.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -257,7 +257,6 @@
		<string name="bluetooth_show_devices_without_names" msgid="923584526471885819">"የብሉቱዝ መሣሪያዎችን ያለ ስሞች አሳይ"</string>
		<string name="bluetooth_disable_absolute_volume" msgid="1452342324349203434">"ፍጹማዊ ድምፅን አሰናክል"</string>
		<string name="bluetooth_enable_gabeldorsche" msgid="9131730396242883416">"Gabeldorscheን አንቃ"</string>
		<string name="enhanced_connectivity" msgid="7201127377781666804">"የተሻሻለ ተገናኝነት"</string>
		<string name="bluetooth_select_avrcp_version_string" msgid="1710571610177659127">"የብሉቱዝ AVRCP ስሪት"</string>
		<string name="bluetooth_select_avrcp_version_dialog_title" msgid="7846922290083709633">"የብሉቱዝ AVRCP ስሪት ይምረጡ"</string>
		<string name="bluetooth_select_map_version_string" msgid="526308145174175327">"የብሉቱዝ MAP ስሪት"</string>