OSDN -- Open-Source-Software-Entwicklung und Downloads
Übersetzungsstatus von Deutsch translation status for de

Android-x86
Fork
Spenden

  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

packages-apps-Settings: Commit

packages/apps/Settings


Commit MetaInfo

Revision9c1e38d8ab09054d8fc166d0bdeb1dd95418ce05 (tree)
Zeit2018-01-04 17:40:20
AutorChih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Log Message

Android 7.1.2 Release 36 (N2G48H)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWicTkQAKCRDorT+BmrEO
eNixAJkB4Vv6qwWXm7pED24iEKsopkKfSgCdFN+Klbp5awK6PAn1Obi+htRfvWk=
=6D5A
-----END PGP SIGNATURE-----

Merge tag 'android-7.1.2_r36' into nougat-x86

Android 7.1.2 Release 36 (N2G48H)

Ändern Zusammenfassung

Diff

--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -86,6 +86,7 @@
8686 <uses-permission android:name="android.permission.PEERS_MAC_ADDRESS"/>
8787 <uses-permission android:name="android.permission.MANAGE_NOTIFICATIONS"/>
8888 <uses-permission android:name="android.permission.DELETE_PACKAGES"/>
89+ <uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS" />
8990
9091 <permission
9192 android:name="android.permission.REQUEST_SUPERUSER"
--- a/src/com/android/settings/ActivityPicker.java
+++ b/src/com/android/settings/ActivityPicker.java
@@ -78,6 +78,10 @@ public class ActivityPicker extends AlertActivity implements
7878 Parcelable parcel = intent.getParcelableExtra(Intent.EXTRA_INTENT);
7979 if (parcel instanceof Intent) {
8080 mBaseIntent = (Intent) parcel;
81+ mBaseIntent.setFlags(mBaseIntent.getFlags() & ~(Intent.FLAG_GRANT_READ_URI_PERMISSION
82+ | Intent.FLAG_GRANT_WRITE_URI_PERMISSION
83+ | Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION
84+ | Intent.FLAG_GRANT_PREFIX_URI_PERMISSION));
8185 } else {
8286 mBaseIntent = new Intent(Intent.ACTION_MAIN, null);
8387 mBaseIntent.addCategory(Intent.CATEGORY_DEFAULT);
--- a/src/com/android/settings/DeviceAdminAdd.java
+++ b/src/com/android/settings/DeviceAdminAdd.java
@@ -16,6 +16,8 @@
1616
1717 package com.android.settings;
1818
19+import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
20+
1921 import android.app.Activity;
2022 import android.app.ActivityManagerNative;
2123 import android.app.AlertDialog;
@@ -88,7 +90,6 @@ public class DeviceAdminAdd extends Activity {
8890 Handler mHandler;
8991
9092 DevicePolicyManager mDPM;
91- AppOpsManager mAppOps;
9293 DeviceAdminInfo mDeviceAdmin;
9394 CharSequence mAddMsgText;
9495 String mProfileOwnerName;
@@ -113,19 +114,17 @@ public class DeviceAdminAdd extends Activity {
113114 boolean mWaitingForRemoveMsg;
114115 boolean mAddingProfileOwner;
115116 boolean mAdminPoliciesInitialized;
116- int mCurSysAppOpMode;
117- int mCurToastAppOpMode;
118117
119118 boolean mIsCalledFromSupportDialog = false;
120119
121120 @Override
122121 protected void onCreate(Bundle icicle) {
123122 super.onCreate(icicle);
123+ getWindow().addPrivateFlags(PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
124124
125125 mHandler = new Handler(getMainLooper());
126126
127127 mDPM = (DevicePolicyManager)getSystemService(Context.DEVICE_POLICY_SERVICE);
128- mAppOps = (AppOpsManager)getSystemService(Context.APP_OPS_SERVICE);
129128 PackageManager packageManager = getPackageManager();
130129
131130 if ((getIntent().getFlags()&Intent.FLAG_ACTIVITY_NEW_TASK) != 0) {
@@ -447,24 +446,14 @@ public class DeviceAdminAdd extends Activity {
447446 @Override
448447 protected void onResume() {
449448 super.onResume();
449+ mActionButton.setEnabled(true);
450450 updateInterface();
451- // As long as we are running, don't let this admin overlay stuff on top of the screen.
452- final int uid = mDeviceAdmin.getActivityInfo().applicationInfo.uid;
453- final String pkg = mDeviceAdmin.getActivityInfo().applicationInfo.packageName;
454- mCurSysAppOpMode = mAppOps.checkOp(AppOpsManager.OP_SYSTEM_ALERT_WINDOW, uid, pkg);
455- mCurToastAppOpMode = mAppOps.checkOp(AppOpsManager.OP_TOAST_WINDOW, uid, pkg);
456- mAppOps.setMode(AppOpsManager.OP_SYSTEM_ALERT_WINDOW, uid, pkg, AppOpsManager.MODE_IGNORED);
457- mAppOps.setMode(AppOpsManager.OP_TOAST_WINDOW, uid, pkg, AppOpsManager.MODE_IGNORED);
458451 }
459452
460453 @Override
461454 protected void onPause() {
462455 super.onPause();
463- // As long as we are running, don't let this admin overlay stuff on top of the screen.
464- final int uid = mDeviceAdmin.getActivityInfo().applicationInfo.uid;
465- final String pkg = mDeviceAdmin.getActivityInfo().applicationInfo.packageName;
466- mAppOps.setMode(AppOpsManager.OP_SYSTEM_ALERT_WINDOW, uid, pkg, mCurSysAppOpMode);
467- mAppOps.setMode(AppOpsManager.OP_TOAST_WINDOW, uid, pkg, mCurToastAppOpMode);
456+ mActionButton.setEnabled(false);
468457 try {
469458 ActivityManagerNative.getDefault().resumeAppSwitches();
470459 } catch (RemoteException e) {
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -39,6 +39,8 @@ import android.view.MenuInflater;
3939 import android.view.MenuItem;
4040 import android.view.MotionEvent;
4141 import android.view.View;
42+import android.view.Window;
43+import android.view.WindowManager;
4244 import android.view.accessibility.AccessibilityManager;
4345 import android.widget.ImageView;
4446 import android.widget.LinearLayout;
@@ -55,6 +57,8 @@ import com.android.settingslib.accessibility.AccessibilityUtils;
5557
5658 import java.util.List;
5759
60+import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
61+
5862 public class ToggleAccessibilityServicePreferenceFragment
5963 extends ToggleFeaturePreferenceFragment implements DialogInterface.OnClickListener {
6064
@@ -178,6 +182,10 @@ public class ToggleAccessibilityServicePreferenceFragment
178182
179183 ad.create();
180184 ad.getButton(AlertDialog.BUTTON_POSITIVE).setOnTouchListener(filterTouchListener);
185+ Window window = ad.getWindow();
186+ WindowManager.LayoutParams params = window.getAttributes();
187+ params.privateFlags |= PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
188+ window.setAttributes(params);
181189 return ad;
182190 }
183191 case DIALOG_ID_DISABLE_WARNING: {
Show on old repository browser