Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ac5f9628: am 7df411d0: Merge "Clear calling identity before getting the current user." into mnc-dev

Browse Source 
* commit 'ac5f962898de5a00fa2067e987b94bc28c5bb096':
  Clear calling identity before getting the current user.
This commit is contained in:
Julia Reynolds
2015-08-14 19:30:28 +00:00
committed by Android Git Automerger
parent 4fb3e9b3af ac5f962898
commit 4e65a05fb9
1 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -3615,22 +3615,28 @@ public class NotificationManagerService extends SystemService {
public ArraySet<String> getGrantedPackages() { public ArraySet<String> getGrantedPackages() {
final ArraySet<String> pkgs = new ArraySet<>(); final ArraySet<String> pkgs = new ArraySet<>();
final String setting = Settings.Secure.getStringForUser(
getContext().getContentResolver(), long identity = Binder.clearCallingIdentity();
Settings.Secure.ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES, try {
ActivityManager.getCurrentUser()); final String setting = Settings.Secure.getStringForUser(
if (setting != null) { getContext().getContentResolver(),
final String[] tokens = setting.split(SEPARATOR); Settings.Secure.ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES,
for (int i = 0; i < tokens.length; i++) { ActivityManager.getCurrentUser());
String token = tokens[i]; if (setting != null) {
if (token != null) { final String[] tokens = setting.split(SEPARATOR);
token.trim(); for (int i = 0; i < tokens.length; i++) {
String token = tokens[i];
if (token != null) {
token.trim();
}
if (TextUtils.isEmpty(token)) {
continue;
}
pkgs.add(token);
} }
if (TextUtils.isEmpty(token)) {
continue;
}
pkgs.add(token);
} }
} finally {
Binder.restoreCallingIdentity(identity);
} }
return pkgs; return pkgs;
} }