diff options
| author | 2018-10-30 13:35:03 -0700 | |
|---|---|---|
| committer | 2018-10-31 19:53:28 +0000 | |
| commit | aaff007b17f27fab411e9a433a64c08040a02a48 (patch) | |
| tree | 2258d008d1f47478fe4feb6793f6cdb4450cbb26 | |
| parent | f4bebfea9f69c3e81b6b4ce0e46802576fdfff63 (diff) | |
Revert sms appops to their original defaults
The appop defaults change is now handled in a better way with ag/5372491
This also reverts the special treatment of MODE_IGNORED in SmsAmmplication
to be compatible with the default value of OP_WRITE_SMS being reverted to
Fixes: 118452447
Test: atest android.telephony.cts.SmsManagerTest
Change-Id: I88b01136aaaf8a243d3a14a873e8a15c02a57673
| -rw-r--r-- | core/java/android/app/AppOpsManager.java | 12 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/SmsApplication.java | 11 |
2 files changed, 7 insertions, 16 deletions
diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java index a4f1db336ba5..690bf3c30734 100644 --- a/core/java/android/app/AppOpsManager.java +++ b/core/java/android/app/AppOpsManager.java @@ -1285,13 +1285,13 @@ public class AppOpsManager { AppOpsManager.MODE_ALLOWED, // POST_NOTIFICATION AppOpsManager.MODE_ALLOWED, // NEIGHBORING_CELLS AppOpsManager.MODE_ALLOWED, // CALL_PHONE - AppOpsManager.MODE_DEFAULT, // READ_SMS - AppOpsManager.MODE_DEFAULT, // WRITE_SMS - AppOpsManager.MODE_DEFAULT, // RECEIVE_SMS + AppOpsManager.MODE_ALLOWED, // READ_SMS + AppOpsManager.MODE_IGNORED, // WRITE_SMS + AppOpsManager.MODE_ALLOWED, // RECEIVE_SMS AppOpsManager.MODE_ALLOWED, // RECEIVE_EMERGENCY_BROADCAST AppOpsManager.MODE_ALLOWED, // RECEIVE_MMS - AppOpsManager.MODE_DEFAULT, // RECEIVE_WAP_PUSH - AppOpsManager.MODE_DEFAULT, // SEND_SMS + AppOpsManager.MODE_ALLOWED, // RECEIVE_WAP_PUSH + AppOpsManager.MODE_ALLOWED, // SEND_SMS AppOpsManager.MODE_ALLOWED, // READ_ICC_SMS AppOpsManager.MODE_ALLOWED, // WRITE_ICC_SMS AppOpsManager.MODE_DEFAULT, // WRITE_SETTINGS @@ -1328,7 +1328,7 @@ public class AppOpsManager { AppOpsManager.MODE_ALLOWED, // PROCESS_OUTGOING_CALLS AppOpsManager.MODE_ALLOWED, // USE_FINGERPRINT AppOpsManager.MODE_ALLOWED, // BODY_SENSORS - AppOpsManager.MODE_DEFAULT, // READ_CELL_BROADCASTS + AppOpsManager.MODE_ALLOWED, // READ_CELL_BROADCASTS AppOpsManager.MODE_ERRORED, // MOCK_LOCATION AppOpsManager.MODE_ALLOWED, // READ_EXTERNAL_STORAGE AppOpsManager.MODE_ALLOWED, // WRITE_EXTERNAL_STORAGE diff --git a/telephony/java/com/android/internal/telephony/SmsApplication.java b/telephony/java/com/android/internal/telephony/SmsApplication.java index 5b8028b52ae4..9874f809c0b4 100644 --- a/telephony/java/com/android/internal/telephony/SmsApplication.java +++ b/telephony/java/com/android/internal/telephony/SmsApplication.java @@ -562,8 +562,7 @@ public final class SmsApplication { + AppOpsManager.modeToName(appOp) + ": " + (updateIfNeeded ? " (fixing)" : " (no permission to fix)")); if (updateIfNeeded) { - setExclusiveAppop(applicationData.mPackageName, appOps, appOp, - AppOpsManager.MODE_ALLOWED, applicationData.mUid); + appOps.setUidMode(appOp, applicationData.mUid, AppOpsManager.MODE_ALLOWED); } else { return false; } @@ -732,14 +731,6 @@ public final class SmsApplication { private static void setExclusiveAppops(String pkg, AppOpsManager appOpsManager, int uid, int mode) { for (int appop : DEFAULT_APP_EXCLUSIVE_APPOPS) { - setExclusiveAppop(pkg, appOpsManager, appop, mode, uid); - } - } - - private static void setExclusiveAppop(String pkg, AppOpsManager appOpsManager, int appop, - int mode, int uid) { - // IGNORED means user explicitly revoked permission in settings, so avoid overriding it. - if (appOpsManager.checkOpNoThrow(appop, uid, pkg) != AppOpsManager.MODE_IGNORED) { appOpsManager.setUidMode(appop, uid, mode); } } |