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

Merge change 8338 into donut

Browse Source 
* changes:
  Have the notification service only have notifications diabled until setup wizard has been run.
This commit is contained in:
Android (Google) Code Review
2009-07-23 09:41:08 -07:00
parent 3867301423 39f5b6a081
commit ea9f9637e4
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/java/com/android/server/NotificationManagerService.java
View File

@@ -90,7 +90,7 @@ class NotificationManagerService extends INotificationManager.Stub
private NotificationRecord mSoundNotification; private NotificationRecord mSoundNotification;
private AsyncPlayer mSound; private AsyncPlayer mSound;
private boolean mSystemReady; private boolean mSystemReady;
private int mDisabledNotifications = StatusBarManager.DISABLE_NOTIFICATION_ALERTS; private int mDisabledNotifications;
private NotificationRecord mVibrateNotification; private NotificationRecord mVibrateNotification;
private Vibrator mVibrator = new Vibrator(); private Vibrator mVibrator = new Vibrator();
@@ -368,6 +368,15 @@ class NotificationManagerService extends INotificationManager.Stub
mStatusBarService = statusBar; mStatusBarService = statusBar;
statusBar.setNotificationCallbacks(mNotificationCallbacks); statusBar.setNotificationCallbacks(mNotificationCallbacks);
// Don't start allowing notifications until the setup wizard has run once.
// After that, including subsequent boots, init with notifications turned on.
// This works on the first boot because the setup wizard will toggle this
// flag at least once and we'll go back to 0 after that.
if (0 == Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.DEVICE_PROVISIONED, 0)) {
mDisabledNotifications = StatusBarManager.DISABLE_NOTIFICATION_ALERTS;
}
// register for battery changed notifications // register for battery changed notifications
IntentFilter filter = new IntentFilter(); IntentFilter filter = new IntentFilter();
filter.addAction(Intent.ACTION_BATTERY_CHANGED); filter.addAction(Intent.ACTION_BATTERY_CHANGED);
@@ -1049,6 +1058,8 @@ class NotificationManagerService extends INotificationManager.Stub
pw.println(" mSoundNotification=" + mSoundNotification); pw.println(" mSoundNotification=" + mSoundNotification);
pw.println(" mSound=" + mSound); pw.println(" mSound=" + mSound);
pw.println(" mVibrateNotification=" + mVibrateNotification); pw.println(" mVibrateNotification=" + mVibrateNotification);
pw.println(" mDisabledNotifications=0x" + Integer.toHexString(mDisabledNotifications));
pw.println(" mSystemReady=" + mSystemReady);
} }
} }
} }