OSDN Git Service

Merge "Allow apps to bypass Power Save restrictions when launched from a Notification...
authorFelipe Leme <felipeal@google.com>
Fri, 27 May 2016 20:04:22 +0000 (20:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 27 May 2016 20:04:22 +0000 (20:04 +0000)
commit8c8ea506d91db44de1d312612a8f63ab107af799
treeac2334b0f7544bc57a38eab1742960a07d80cb28
parentc17513ef376accac19b09875291237a757819450
parentefa291a8605e91d775faf46ada349ec7f81fcdb9
Merge "Allow apps to bypass Power Save restrictions when launched from a Notification\'s PendingIntent." into nyc-dev
am: efa291a860

* commit 'efa291a8605e91d775faf46ada349ec7f81fcdb9':
  Allow apps to bypass Power Save restrictions when launched from a Notification's PendingIntent.

Change-Id: Ibd09b082140b66d25bd8583040761581bb20af76
core/java/android/content/Context.java
core/java/android/provider/Settings.java
services/core/java/com/android/server/am/ActivityManagerService.java