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

Merge changes I6b52e378,I1699e6bf into nyc-dev

Browse Source 
* changes:
  Phone call vibrate should obey user preference.
  Adjustment bundles are defusable.
This commit is contained in:
Julia Reynolds
2016-04-14 14:42:52 +00:00
committed by Android (Google) Code Review
parent 3af45bd2d0 d28967f489
commit 8a46d52304
3 changed files with 82 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/VibratorService.java
View File

@@ -454,6 +454,12 @@ public class VibratorService extends IVibratorService.Stub
return; return;
} }
if (vib.mUsageHint == AudioAttributes.USAGE_NOTIFICATION_RINGTONE
&& Settings.System.getInt(
mContext.getContentResolver(), Settings.System.VIBRATE_WHEN_RINGING, 0) == 0) {
return;
}
int mode = mAppOpsService.checkAudioOperation(AppOpsManager.OP_VIBRATE, int mode = mAppOpsService.checkAudioOperation(AppOpsManager.OP_VIBRATE,
vib.mUsageHint, vib.mUid, vib.mOpPkg); vib.mUsageHint, vib.mUid, vib.mOpPkg);
if (mode == AppOpsManager.MODE_ALLOWED) { if (mode == AppOpsManager.MODE_ALLOWED) {

101
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -2186,16 +2186,18 @@ public class NotificationManagerService extends SystemService {
// Clears the 'fake' auto-bunding summary. // Clears the 'fake' auto-bunding summary.
private void maybeClearAutobundleSummaryLocked(Adjustment adjustment) { private void maybeClearAutobundleSummaryLocked(Adjustment adjustment) {
if (adjustment.getSignals() != null if (adjustment.getSignals() != null) {
&& adjustment.getSignals().containsKey(Adjustment.NEEDS_AUTOGROUPING_KEY) Bundle.setDefusable(adjustment.getSignals(), true);
if (adjustment.getSignals().containsKey(Adjustment.NEEDS_AUTOGROUPING_KEY)
&& !adjustment.getSignals().getBoolean(Adjustment.NEEDS_AUTOGROUPING_KEY, false)) { && !adjustment.getSignals().getBoolean(Adjustment.NEEDS_AUTOGROUPING_KEY, false)) {
if (mAutobundledSummaries.containsKey(adjustment.getPackage())) { if (mAutobundledSummaries.containsKey(adjustment.getPackage())) {
// Clear summary. // Clear summary.
final NotificationRecord removed = mNotificationsByKey.get( final NotificationRecord removed = mNotificationsByKey.get(
mAutobundledSummaries.remove(adjustment.getPackage())); mAutobundledSummaries.remove(adjustment.getPackage()));
if (removed != null) { if (removed != null) {
mNotificationList.remove(removed); mNotificationList.remove(removed);
cancelNotificationLocked(removed, false, REASON_UNAUTOBUNDLED); cancelNotificationLocked(removed, false, REASON_UNAUTOBUNDLED);
}
} }
} }
} }
@@ -2203,47 +2205,50 @@ public class NotificationManagerService extends SystemService {
// Posts a 'fake' summary for a package that has exceeded the solo-notification limit. // Posts a 'fake' summary for a package that has exceeded the solo-notification limit.
private void maybeAddAutobundleSummary(Adjustment adjustment) { private void maybeAddAutobundleSummary(Adjustment adjustment) {
if (adjustment.getSignals() != null if (adjustment.getSignals() != null) {
&& adjustment.getSignals().getBoolean(Adjustment.NEEDS_AUTOGROUPING_KEY, false)) { Bundle.setDefusable(adjustment.getSignals(), true);
final String newAutoBundleKey = if (adjustment.getSignals().getBoolean(Adjustment.NEEDS_AUTOGROUPING_KEY, false)) {
adjustment.getSignals().getString(Adjustment.GROUP_KEY_OVERRIDE_KEY, null); final String newAutoBundleKey =
int userId = -1; adjustment.getSignals().getString(Adjustment.GROUP_KEY_OVERRIDE_KEY, null);
NotificationRecord summaryRecord = null; int userId = -1;
synchronized (mNotificationList) { NotificationRecord summaryRecord = null;
if (!mAutobundledSummaries.containsKey(adjustment.getPackage()) synchronized (mNotificationList) {
&& newAutoBundleKey != null) { if (!mAutobundledSummaries.containsKey(adjustment.getPackage())
// Add summary && newAutoBundleKey != null) {
final StatusBarNotification adjustedSbn // Add summary
= mNotificationsByKey.get(adjustment.getKey()).sbn; final StatusBarNotification adjustedSbn
= mNotificationsByKey.get(adjustment.getKey()).sbn;
final ApplicationInfo appInfo = final ApplicationInfo appInfo =
adjustedSbn.getNotification().extras.getParcelable( adjustedSbn.getNotification().extras.getParcelable(
Notification.EXTRA_BUILDER_APPLICATION_INFO); Notification.EXTRA_BUILDER_APPLICATION_INFO);
final Bundle extras = new Bundle(); final Bundle extras = new Bundle();
extras.putParcelable(Notification.EXTRA_BUILDER_APPLICATION_INFO, appInfo); extras.putParcelable(Notification.EXTRA_BUILDER_APPLICATION_INFO, appInfo);
final Notification summaryNotification = final Notification summaryNotification =
new Notification.Builder(getContext()).setSmallIcon( new Notification.Builder(getContext()).setSmallIcon(
adjustedSbn.getNotification().getSmallIcon()) adjustedSbn.getNotification().getSmallIcon())
.setGroupSummary(true) .setGroupSummary(true)
.setGroup(newAutoBundleKey) .setGroup(newAutoBundleKey)
.setFlag(Notification.FLAG_AUTOGROUP_SUMMARY, true) .setFlag(Notification.FLAG_AUTOGROUP_SUMMARY, true)
.setFlag(Notification.FLAG_GROUP_SUMMARY, true) .setFlag(Notification.FLAG_GROUP_SUMMARY, true)
.build(); .build();
summaryNotification.extras.putAll(extras); summaryNotification.extras.putAll(extras);
final StatusBarNotification summarySbn = final StatusBarNotification summarySbn =
new StatusBarNotification(adjustedSbn.getPackageName(), new StatusBarNotification(adjustedSbn.getPackageName(),
adjustedSbn.getOpPkg(), adjustedSbn.getOpPkg(),
Integer.MAX_VALUE, Adjustment.GROUP_KEY_OVERRIDE_KEY, Integer.MAX_VALUE, Adjustment.GROUP_KEY_OVERRIDE_KEY,
adjustedSbn.getUid(), adjustedSbn.getInitialPid(), adjustedSbn.getUid(), adjustedSbn.getInitialPid(),
summaryNotification, adjustedSbn.getUser(), newAutoBundleKey, summaryNotification, adjustedSbn.getUser(),
System.currentTimeMillis()); newAutoBundleKey,
summaryRecord = new NotificationRecord(getContext(), summarySbn); System.currentTimeMillis());
mAutobundledSummaries.put(adjustment.getPackage(), summarySbn.getKey()); summaryRecord = new NotificationRecord(getContext(), summarySbn);
userId = adjustedSbn.getUser().getIdentifier(); mAutobundledSummaries.put(adjustment.getPackage(), summarySbn.getKey());
userId = adjustedSbn.getUser().getIdentifier();
}
}
if (summaryRecord != null) {
mHandler.post(new EnqueueNotificationRunnable(userId, summaryRecord));
} }
}
if (summaryRecord != null) {
mHandler.post(new EnqueueNotificationRunnable(userId, summaryRecord));
} }
} }
} }

23
tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java
View File

@@ -25,6 +25,7 @@ import android.content.Intent;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.BitmapDrawable;
import android.media.AudioAttributes;
import android.os.Bundle; import android.os.Bundle;
import android.os.Vibrator; import android.os.Vibrator;
import android.os.Handler; import android.os.Handler;
@@ -86,6 +87,28 @@ public class NotificationTestList extends TestActivity
} }
private Test[] mTests = new Test[] { private Test[] mTests = new Test[] {
new Test("Phone call") {
public void run()
{
Notification n = new Notification.Builder(NotificationTestList.this)
.setSmallIcon(R.drawable.icon2)
.setContentTitle("phone call")
.setLights(0xff0000ff, 1, 0)
.setDefaults(Notification.DEFAULT_LIGHTS|Notification.DEFAULT_VIBRATE)
.setSound(Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE + "://" +
getPackageName() + "/raw/ringer"),
new AudioAttributes.Builder().setUsage(
AudioAttributes.USAGE_NOTIFICATION_RINGTONE).build())
.setPriority(Notification.PRIORITY_MAX)
.setVibrate(new long[] {
300, 400, 300, 400, 300, 400, 300, 400, 300, 400, 300, 400,
300, 400, 300, 400, 300, 400, 300, 400, 300, 400, 300, 400,
300, 400, 300, 400, 300, 400, 300, 400, 300, 400, 300, 400 })
.setFullScreenIntent(makeIntent2(), true)
.build();
mNM.notify(7001, n);
}
},
new Test("Post a group") { new Test("Post a group") {
public void run() public void run()
{ {