PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Specify user when starting service" into klp-dev

Browse Source
This commit is contained in:
Tom O'Neill
2013-09-09 20:04:27 +00:00
committed by Android (Google) Code Review
parent d1253a2b43 7f91d86283
commit b23c86dd2e
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/location/SettingsInjector.java
View File

@@ -312,7 +312,8 @@ class SettingsInjector {
mSettingsBeingLoaded.remove(timedOutSetting); mSettingsBeingLoaded.remove(timedOutSetting);
mTimedOutSettings.add(timedOutSetting); mTimedOutSettings.add(timedOutSetting);
if (Log.isLoggable(TAG, Log.WARN)) { if (Log.isLoggable(TAG, Log.WARN)) {
Log.w(TAG, "Timed out trying to get status for: " + timedOutSetting); Log.w(TAG, "Timed out after " + timedOutSetting.getElapsedTime()
+ " millis trying to get status for: " + timedOutSetting);
} }
break; break;
default: default:
@@ -447,13 +448,21 @@ class SettingsInjector {
} else { } else {
startMillis = 0; startMillis = 0;
} }
mContext.startService(intent);
// Start the service, making sure that this is attributed to the current user rather
// than the system user.
mContext.startServiceAsUser(intent, android.os.Process.myUserHandle());
}
public long getElapsedTime() {
long end = SystemClock.elapsedRealtime();
return end - startMillis;
} }
public void maybeLogElapsedTime() { public void maybeLogElapsedTime() {
if (Log.isLoggable(TAG, Log.DEBUG) && startMillis != 0) { if (Log.isLoggable(TAG, Log.DEBUG) && startMillis != 0) {
long end = SystemClock.elapsedRealtime(); long elapsed = getElapsedTime();
Log.d(TAG, this + " update took " + (end - startMillis) + " millis"); Log.d(TAG, this + " update took " + elapsed + " millis");
} }
} }
} }