Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6d2c636..bea9a3c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2973,7 +2973,6 @@
<activity android:name=".FallbackHome"
android:excludeFromRecents="true"
android:label=""
- android:screenOrientation="nosensor"
android:taskAffinity="com.android.settings.FallbackHome"
android:exported="true"
android:theme="@style/FallbackHome"
diff --git a/res/layout-sw600dp/confirm_lock_password.xml b/res/layout-sw600dp/confirm_lock_password.xml
index 3925a69..7489d10 100644
--- a/res/layout-sw600dp/confirm_lock_password.xml
+++ b/res/layout-sw600dp/confirm_lock_password.xml
@@ -14,16 +14,14 @@
~ See the License for the specific language governing permissions and
~ limitations under the License
-->
-<com.google.android.setupdesign.GlifLayout
+<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout="@layout/sud_glif_blank_template">
+ android:layout_height="match_parent">
<include
layout="@layout/confirm_lock_password_base"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_horizontal" />
-</com.google.android.setupdesign.GlifLayout>
+</FrameLayout>
diff --git a/res/layout-sw600dp/confirm_lock_pattern.xml b/res/layout-sw600dp/confirm_lock_pattern.xml
index 51af1f3..1551517 100644
--- a/res/layout-sw600dp/confirm_lock_pattern.xml
+++ b/res/layout-sw600dp/confirm_lock_pattern.xml
@@ -13,16 +13,14 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.google.android.setupdesign.GlifLayout
+<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout="@layout/sud_glif_blank_template">
+ android:layout_height="match_parent">
<include
layout="@layout/confirm_lock_pattern_base"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_horizontal" />
-</com.google.android.setupdesign.GlifLayout>
+</FrameLayout>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index 691e19f..01c4951 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -296,7 +296,7 @@
<item msgid="2504191192460059817">"روشن کردن صفحه"</item>
<item msgid="7905819538788103556">"دریافت حسابها"</item>
<item msgid="1675025662248079254">"اجرا در پسزمینه"</item>
- <item msgid="2553974920157061225">"میزان دسترسپذیری"</item>
+ <item msgid="2553974920157061225">"میزان صدای دسترسپذیری"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="7780927354556651567">"موقعیت مکانی"</item>
@@ -363,7 +363,7 @@
<item msgid="4281352581602735717">"روشن کردن صفحه"</item>
<item msgid="346122795998225472">"دریافت حسابها"</item>
<item msgid="3756073389408535680">"اجرا در پسزمینه"</item>
- <item msgid="2114661179947426734">"میزان دسترسپذیری"</item>
+ <item msgid="2114661179947426734">"میزان صدای دسترسپذیری"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="6926391290986427331">"کوتاه"</item>
diff --git a/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetails.java b/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetails.java
index e6feebb..2094890 100644
--- a/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetails.java
+++ b/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetails.java
@@ -16,14 +16,14 @@
package com.android.settings.applications.specialaccess.notificationaccess;
+import static android.content.pm.PackageManager.PERMISSION_GRANTED;
+
import static com.android.settings.applications.AppInfoBase.ARG_PACKAGE_NAME;
-import android.app.Activity;
+import android.Manifest;
import android.app.NotificationManager;
import android.app.settings.SettingsEnums;
import android.companion.ICompanionDeviceManager;
-import android.compat.annotation.ChangeId;
-import android.compat.annotation.EnabledAfter;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -37,8 +37,8 @@
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
-import android.service.notification.NotificationListenerFilter;
import android.service.notification.NotificationListenerService;
+import android.text.TextUtils;
import android.util.Log;
import android.util.Slog;
@@ -48,7 +48,6 @@
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.applications.AppInfoBase;
-import com.android.settings.applications.manageapplications.ManageApplications;
import com.android.settings.bluetooth.Utils;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.dashboard.DashboardFragment;
@@ -208,8 +207,12 @@
}
}
if (intent != null && intent.hasExtra(Intent.EXTRA_USER_HANDLE)) {
- mUserId = ((UserHandle) intent.getParcelableExtra(
- Intent.EXTRA_USER_HANDLE)).getIdentifier();
+ if (hasInteractAcrossUsersPermission()) {
+ mUserId = ((UserHandle) intent.getParcelableExtra(
+ Intent.EXTRA_USER_HANDLE)).getIdentifier();
+ } else {
+ finish();
+ }
} else {
mUserId = UserHandle.myUserId();
}
@@ -224,6 +227,26 @@
}
}
+ private boolean hasInteractAcrossUsersPermission() {
+ final String callingPackageName =
+ ((SettingsActivity) getActivity()).getInitialCallingPackage();
+
+ if (TextUtils.isEmpty(callingPackageName)) {
+ Log.w(TAG, "Not able to get calling package name for permission check");
+ return false;
+ }
+
+ if (getContext().getPackageManager().checkPermission(
+ Manifest.permission.INTERACT_ACROSS_USERS_FULL, callingPackageName)
+ != PERMISSION_GRANTED) {
+ Log.w(TAG, "Package " + callingPackageName + " does not have required permission "
+ + Manifest.permission.INTERACT_ACROSS_USERS_FULL);
+ return false;
+ }
+
+ return true;
+ }
+
// Dialogs only have access to the parent fragment, not the controller, so pass the information
// along to keep business logic out of this file
public void disable(final ComponentName cn) {