diff options
author | Tom O'Neill <tomo@google.com> | 2013-09-09 14:25:11 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-09 14:25:11 -0700 |
commit | 0bd296742473bb4c5ed7150cea05c25817b36b80 (patch) | |
tree | 61a59310e15dd2f7542037577e20fca845d5533d /src/com | |
parent | c75a2c58d85163cadb4d8b8582ebd81c2c9ecc68 (diff) | |
parent | b23c86dd2ec48387f099749673df75cc332761e5 (diff) | |
download | packages_apps_Settings-0bd296742473bb4c5ed7150cea05c25817b36b80.zip packages_apps_Settings-0bd296742473bb4c5ed7150cea05c25817b36b80.tar.gz packages_apps_Settings-0bd296742473bb4c5ed7150cea05c25817b36b80.tar.bz2 |
am b23c86dd: Merge "Specify user when starting service" into klp-dev
* commit 'b23c86dd2ec48387f099749673df75cc332761e5':
Specify user when starting service
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/settings/location/SettingsInjector.java | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/com/android/settings/location/SettingsInjector.java b/src/com/android/settings/location/SettingsInjector.java index 12bf38f..b919080 100644 --- a/src/com/android/settings/location/SettingsInjector.java +++ b/src/com/android/settings/location/SettingsInjector.java @@ -312,7 +312,8 @@ class SettingsInjector { mSettingsBeingLoaded.remove(timedOutSetting); mTimedOutSettings.add(timedOutSetting); 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; default: @@ -447,13 +448,21 @@ class SettingsInjector { } else { 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() { if (Log.isLoggable(TAG, Log.DEBUG) && startMillis != 0) { - long end = SystemClock.elapsedRealtime(); - Log.d(TAG, this + " update took " + (end - startMillis) + " millis"); + long elapsed = getElapsedTime(); + Log.d(TAG, this + " update took " + elapsed + " millis"); } } } |