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

Merge "Polish up PRE_BOOT notification." into nyc-mr1-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2016-07-26 21:52:04 +00:00
committed by Android (Google) Code Review
parent 9f3930d3f7 288414e226
commit 445c01b591
1 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
services/core/java/com/android/server/am/PreBootBroadcaster.java
View File

@@ -21,6 +21,7 @@ import static android.content.pm.PackageManager.MATCH_SYSTEM_ONLY;
import android.app.AppOpsManager; import android.app.AppOpsManager;
import android.app.Notification; import android.app.Notification;
import android.app.NotificationManager; import android.app.NotificationManager;
import android.app.PendingIntent;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.IIntentReceiver; import android.content.IIntentReceiver;
@@ -50,6 +51,7 @@ public abstract class PreBootBroadcaster extends IIntentReceiver.Stub {
private final ActivityManagerService mService; private final ActivityManagerService mService;
private final int mUserId; private final int mUserId;
private final ProgressReporter mProgress; private final ProgressReporter mProgress;
private final boolean mQuiet;
private final Intent mIntent; private final Intent mIntent;
private final List<ResolveInfo> mTargets; private final List<ResolveInfo> mTargets;
@@ -61,16 +63,13 @@ public abstract class PreBootBroadcaster extends IIntentReceiver.Stub {
mService = service; mService = service;
mUserId = userId; mUserId = userId;
mProgress = progress; mProgress = progress;
mQuiet = quiet;
mIntent = new Intent(Intent.ACTION_PRE_BOOT_COMPLETED); mIntent = new Intent(Intent.ACTION_PRE_BOOT_COMPLETED);
mIntent.addFlags(Intent.FLAG_RECEIVER_BOOT_UPGRADE | Intent.FLAG_DEBUG_TRIAGED_MISSING); mIntent.addFlags(Intent.FLAG_RECEIVER_BOOT_UPGRADE | Intent.FLAG_DEBUG_TRIAGED_MISSING);
mTargets = mService.mContext.getPackageManager().queryBroadcastReceiversAsUser(mIntent, mTargets = mService.mContext.getPackageManager().queryBroadcastReceiversAsUser(mIntent,
MATCH_SYSTEM_ONLY, UserHandle.of(userId)); MATCH_SYSTEM_ONLY, UserHandle.of(userId));
if (!quiet) {
mHandler.obtainMessage(MSG_SHOW).sendToTarget();
}
} }
public void sendNext() { public void sendNext() {
@@ -87,6 +86,10 @@ public abstract class PreBootBroadcaster extends IIntentReceiver.Stub {
return; return;
} }
if (!mQuiet) {
mHandler.obtainMessage(MSG_SHOW, mTargets.size(), mIndex).sendToTarget();
}
final ResolveInfo ri = mTargets.get(mIndex++); final ResolveInfo ri = mTargets.get(mIndex++);
final ComponentName componentName = ri.activityInfo.getComponentName(); final ComponentName componentName = ri.activityInfo.getComponentName();
@@ -121,13 +124,26 @@ public abstract class PreBootBroadcaster extends IIntentReceiver.Stub {
final Context context = mService.mContext; final Context context = mService.mContext;
final NotificationManager notifManager = context final NotificationManager notifManager = context
.getSystemService(NotificationManager.class); .getSystemService(NotificationManager.class);
final int max = msg.arg1;
final int index = msg.arg2;
switch (msg.what) { switch (msg.what) {
case MSG_SHOW: case MSG_SHOW:
final CharSequence title = context final CharSequence title = context
.getText(R.string.android_upgrading_notification_title); .getText(R.string.android_upgrading_title);
final CharSequence message = context
.getText(R.string.android_upgrading_notification_body); final Intent intent = new Intent();
intent.setClassName("com.android.settings",
"com.android.settings.HelpTrampoline");
intent.putExtra(Intent.EXTRA_TEXT, "help_url_upgrading");
final PendingIntent contentIntent;
if (context.getPackageManager().resolveActivity(intent, 0) != null) {
contentIntent = PendingIntent.getActivity(context, 0, intent, 0);
} else {
contentIntent = null;
}
final Notification notif = new Notification.Builder(mService.mContext) final Notification notif = new Notification.Builder(mService.mContext)
.setSmallIcon(R.drawable.stat_sys_adb) .setSmallIcon(R.drawable.stat_sys_adb)
.setWhen(0) .setWhen(0)
@@ -138,8 +154,9 @@ public abstract class PreBootBroadcaster extends IIntentReceiver.Stub {
.setColor(context.getColor( .setColor(context.getColor(
com.android.internal.R.color.system_notification_accent_color)) com.android.internal.R.color.system_notification_accent_color))
.setContentTitle(title) .setContentTitle(title)
.setContentText(message) .setContentIntent(contentIntent)
.setVisibility(Notification.VISIBILITY_PUBLIC) .setVisibility(Notification.VISIBILITY_PUBLIC)
.setProgress(max, index, false)
.build(); .build();
notifManager.notifyAsUser(TAG, 0, notif, UserHandle.of(mUserId)); notifManager.notifyAsUser(TAG, 0, notif, UserHandle.of(mUserId));
break; break;