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

Fix location settings crash when work profile is disabled

Browse Source 
am: 3bd4771

* commit '3bd4771ccb6f05c30cf7de6b2092f4f580821b56':
  Fix location settings crash when work profile is disabled
This commit is contained in:
Ricky Wai
2016-03-18 14:26:26 +00:00
committed by android-build-merger
parent 89d419eb37 3bd4771ccb
commit b8e660b62f
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,7 @@
package com.android.settings.location; package com.android.settings.location;
import android.app.ActivityManager;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
@@ -474,6 +475,15 @@ class SettingsInjector {
* preference when the service replies. * preference when the service replies.
*/ */
public void startService() { public void startService() {
final ActivityManager am = (ActivityManager)
mContext.getSystemService(Context.ACTIVITY_SERVICE);
if (!am.isUserRunning(setting.mUserHandle.getIdentifier())) {
if (Log.isLoggable(TAG, Log.VERBOSE)) {
Log.v(TAG, "Cannot start service as user "
+ setting.mUserHandle.getIdentifier() + " is not running");
}
return;
}
Handler handler = new Handler() { Handler handler = new Handler() {
@Override @Override
public void handleMessage(Message msg) { public void handleMessage(Message msg) {