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

Merge "Fix #29073394: Need to bind to scorer after user is unlocked." into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-06-08 14:32:42 +00:00
committed by Android (Google) Code Review
parent 002ccec5c1 967b5815fb
commit 464f7e4983
1 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
services/core/java/com/android/server/NetworkScoreService.java
View File

@@ -17,10 +17,12 @@
package com.android.server; package com.android.server;
import android.Manifest.permission; import android.Manifest.permission;
import android.content.BroadcastReceiver;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter;
import android.content.ServiceConnection; import android.content.ServiceConnection;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.net.INetworkScoreCache; import android.net.INetworkScoreCache;
@@ -67,6 +69,20 @@ public class NetworkScoreService extends INetworkScoreService.Stub {
private NetworkScorerPackageMonitor mPackageMonitor; private NetworkScorerPackageMonitor mPackageMonitor;
private ScoringServiceConnection mServiceConnection; private ScoringServiceConnection mServiceConnection;
private BroadcastReceiver mUserIntentReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
final String action = intent.getAction();
final int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, UserHandle.USER_NULL);
if (DBG) Log.d(TAG, "Received " + action + " for userId " + userId);
if (userId == UserHandle.USER_NULL) return;
if (Intent.ACTION_USER_UNLOCKED.equals(action)) {
onUserUnlocked(userId);
}
}
};
/** /**
* Clears scores when the active scorer package is no longer valid and * Clears scores when the active scorer package is no longer valid and
* manages the service connection. * manages the service connection.
@@ -138,6 +154,11 @@ public class NetworkScoreService extends INetworkScoreService.Stub {
public NetworkScoreService(Context context) { public NetworkScoreService(Context context) {
mContext = context; mContext = context;
mScoreCaches = new HashMap<>(); mScoreCaches = new HashMap<>();
IntentFilter filter = new IntentFilter(Intent.ACTION_USER_UNLOCKED);
// TODO: Need to update when we support per-user scorers. http://b/23422763
mContext.registerReceiverAsUser(
mUserIntentReceiver, UserHandle.SYSTEM, filter, null /* broadcastPermission*/,
null /* scheduler */);
} }
/** Called when the system is ready to run third-party code but before it actually does so. */ /** Called when the system is ready to run third-party code but before it actually does so. */
@@ -164,6 +185,11 @@ public class NetworkScoreService extends INetworkScoreService.Stub {
bindToScoringServiceIfNeeded(); bindToScoringServiceIfNeeded();
} }
private void onUserUnlocked(int userId) {
registerPackageMonitorIfNeeded();
bindToScoringServiceIfNeeded();
}
private void registerPackageMonitorIfNeeded() { private void registerPackageMonitorIfNeeded() {
if (DBG) Log.d(TAG, "registerPackageMonitorIfNeeded"); if (DBG) Log.d(TAG, "registerPackageMonitorIfNeeded");
NetworkScorerAppData scorer = NetworkScorerAppManager.getActiveScorer(mContext); NetworkScorerAppData scorer = NetworkScorerAppManager.getActiveScorer(mContext);
@@ -216,6 +242,8 @@ public class NetworkScoreService extends INetworkScoreService.Stub {
// Make sure the connection is connected (idempotent) // Make sure the connection is connected (idempotent)
mServiceConnection.connect(mContext); mServiceConnection.connect(mContext);
} else { // otherwise make sure it isn't bound.
unbindFromScoringServiceIfNeeded();
} }
} }