drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't set the time zone under the caller's identity" into jb-mr1-dev

Browse Source
This commit is contained in:
Christopher Tate
2012-08-31 14:47:34 -07:00
committed by Android (Google) Code Review
parent 58a2950b66 897798225d
commit 176d105d2f
1 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/java/com/android/server/AlarmManagerService.java
View File

@ -243,6 +243,8 @@ class AlarmManagerService extends IAlarmManager.Stub {
"android.permission.SET_TIME_ZONE",
"setTimeZone");
long oldId = Binder.clearCallingIdentity();
try {
if (TextUtils.isEmpty(tz)) return;
TimeZone zone = TimeZone.getTimeZone(tz);
// Prevent reentrant calls from stepping on each other when writing
@ -251,7 +253,9 @@ class AlarmManagerService extends IAlarmManager.Stub {
synchronized (this) {
String current = SystemProperties.get(TIMEZONE_PROPERTY);
if (current == null || !current.equals(zone.getID())) {
if (localLOGV) Slog.v(TAG, "timezone changed: " + current + ", new=" + zone.getID());
if (localLOGV) {
Slog.v(TAG, "timezone changed: " + current + ", new=" + zone.getID());
}
timeZoneWasChanged = true;
SystemProperties.set(TIMEZONE_PROPERTY, zone.getID());
}
@ -270,6 +274,9 @@ class AlarmManagerService extends IAlarmManager.Stub {
intent.putExtra("time-zone", zone.getID());
mContext.sendBroadcastAsUser(intent, UserHandle.ALL);
}
} finally {
Binder.restoreCallingIdentity(oldId);
}
}
public void remove(PendingIntent operation) {