OSDN Git Service
Julia Reynolds [Tue, 24 May 2016 14:03:03 +0000 (14:03 +0000)]
Set autobundled summary color. am:
3011fd4dbd
am:
40a3d53178
* commit '
40a3d5317805434dacbd671d6d1ccb9207df90b7':
Set autobundled summary color.
Change-Id: Ieae2a6fb1beb9edb7caf20569358e80582123224
Julia Reynolds [Tue, 24 May 2016 13:58:22 +0000 (13:58 +0000)]
Set autobundled summary color.
am:
3011fd4dbd
* commit '
3011fd4dbd4585917af71e109353e6e02332ef5b':
Set autobundled summary color.
Change-Id: I69c940d018ccd41769437c2e711ab07b7a7b369d
Julia Reynolds [Fri, 20 May 2016 14:25:43 +0000 (10:25 -0400)]
Set autobundled summary color.
Change-Id: I8ceb0b045359dc364fcec411fcfc610f7f57d8db
Fixes:
28615262
Android Build Merger (Role) [Tue, 24 May 2016 13:49:50 +0000 (13:49 +0000)]
Merge "Merge "QS: Don\'t cause click noise when opening from QQS" into nyc-dev am:
8a1561a772 am:
9458057c9b" into nyc-mr1-dev-plus-aosp
Jason Monk [Tue, 24 May 2016 13:49:19 +0000 (13:49 +0000)]
Merge "QS: Don\'t cause click noise when opening from QQS" into nyc-dev am:
8a1561a772
am:
9458057c9b
* commit '
9458057c9b688e65d506ed4fabdc76a955aeddf9':
QS: Don't cause click noise when opening from QQS
Change-Id: I03360671df14a68f50b2e4c0de255cb737a2206a
Jason Monk [Tue, 24 May 2016 13:49:17 +0000 (13:49 +0000)]
Merge "QS: Don\'t cause click noise when opening from QQS" into nyc-dev am:
8a1561a772
am:
f6d3295a7b
* commit '
f6d3295a7b953d435b260c69a240d76854916f28':
QS: Don't cause click noise when opening from QQS
Change-Id: I4de4dfebfc96fe9e8eb916cb983301e858364299
Jason Monk [Tue, 24 May 2016 13:43:47 +0000 (13:43 +0000)]
Merge "QS: Don\'t cause click noise when opening from QQS" into nyc-dev
am:
8a1561a772
* commit '
8a1561a772e735b41b48dfb91269b620b5125602':
QS: Don't cause click noise when opening from QQS
Change-Id: Id28b2b808be11f5ebf23b7c8fac749aed1aa0493
Jason Monk [Tue, 24 May 2016 13:43:42 +0000 (13:43 +0000)]
Merge "QS: Don\'t cause click noise when opening from QQS" into nyc-dev
am:
8a1561a772
* commit '
8a1561a772e735b41b48dfb91269b620b5125602':
QS: Don't cause click noise when opening from QQS
Change-Id: I6cd5281ab021be51ad92c86edc9e39b62188c713
Jason Monk [Tue, 24 May 2016 13:35:02 +0000 (13:35 +0000)]
Merge "QS: Don't cause click noise when opening from QQS" into nyc-dev
Android Build Merger (Role) [Tue, 24 May 2016 13:27:28 +0000 (13:27 +0000)]
Merge "Merge "Set accessibility string for suspended widgets." into nyc-dev am:
7b4b2fbc0a am:
7185fc8cc3" into nyc-mr1-dev-plus-aosp
Kenny Guy [Tue, 24 May 2016 13:27:01 +0000 (13:27 +0000)]
Merge "Set accessibility string for suspended widgets." into nyc-dev am:
7b4b2fbc0a
am:
7185fc8cc3
* commit '
7185fc8cc3266ad713a4f19791dec5b7a06e57e0':
Set accessibility string for suspended widgets.
Change-Id: Ice17a4983d11a49d260ca6082f85d03908694e5f
Kenny Guy [Tue, 24 May 2016 13:26:56 +0000 (13:26 +0000)]
Merge "Set accessibility string for suspended widgets." into nyc-dev am:
7b4b2fbc0a
am:
d7d4203050
* commit '
d7d420305094d8e267c8fc3cee5ab2252bf1280c':
Set accessibility string for suspended widgets.
Change-Id: I26a41681436009fb1fc6fc57c102539be0096687
Kenny Guy [Tue, 24 May 2016 13:20:31 +0000 (13:20 +0000)]
Merge "Set accessibility string for suspended widgets." into nyc-dev
am:
7b4b2fbc0a
* commit '
7b4b2fbc0afd9cff3d4bb647b0ed7dc79ab747dc':
Set accessibility string for suspended widgets.
Change-Id: Idc35229ca5da9b460c0b806b3833196d66c48499
Kenny Guy [Tue, 24 May 2016 13:20:25 +0000 (13:20 +0000)]
Merge "Set accessibility string for suspended widgets." into nyc-dev
am:
7b4b2fbc0a
* commit '
7b4b2fbc0afd9cff3d4bb647b0ed7dc79ab747dc':
Set accessibility string for suspended widgets.
Change-Id: Iedafb99a35224a37e816c510284ebfc01fe3c87d
Kenny Guy [Tue, 24 May 2016 13:11:11 +0000 (13:11 +0000)]
Merge "Set accessibility string for suspended widgets." into nyc-dev
Mahaver Chopra [Tue, 24 May 2016 12:30:44 +0000 (12:30 +0000)]
Merge "Disallow OEM unlock when DISALLOW_FACTORY_RESET applies" into nyc-mr1-dev
am:
dd86aa141e
* commit '
dd86aa141e02ffaf277996fc1701141ea13e090e':
Disallow OEM unlock when DISALLOW_FACTORY_RESET applies
Change-Id: I077fd5c067c453a4dcd161ba582e473ade1a8392
Mahaver Chopra [Tue, 24 May 2016 12:22:49 +0000 (12:22 +0000)]
Merge "Disallow OEM unlock when DISALLOW_FACTORY_RESET applies" into nyc-mr1-dev
Sergio Giro [Tue, 24 May 2016 12:18:31 +0000 (12:18 +0000)]
Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote" am:
393b67d65f am:
163f8a2e91
am:
d767eba969
* commit '
d767eba969531b2df1ed41d82dac0853dce67cce':
ZygoteInit: install AndroidKeyStoreProvider in the Zygote
Change-Id: I78cfc9155ab1ab43b4c8280f57f877b551882b9b
Sergio Giro [Tue, 24 May 2016 12:14:18 +0000 (12:14 +0000)]
Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote" am:
393b67d65f
am:
163f8a2e91
* commit '
163f8a2e9132b60f86f28a352ded1db6a38d367e':
ZygoteInit: install AndroidKeyStoreProvider in the Zygote
Change-Id: Ibb6a051e31bb52c246be990fe79495f1f7252b9f
Sergio Giro [Tue, 24 May 2016 12:06:25 +0000 (12:06 +0000)]
Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote"
am:
393b67d65f
* commit '
393b67d65fdbf4565cbec2f40fcabaaf87143dfd':
ZygoteInit: install AndroidKeyStoreProvider in the Zygote
Change-Id: Idc8e1ca4ae2160285fe56995290c241c3a7288f2
Mahaver Chopra [Tue, 17 May 2016 17:53:09 +0000 (18:53 +0100)]
Disallow OEM unlock when DISALLOW_FACTORY_RESET applies
Bug:
28339424
Change-Id: I4b6dc6f186ea60a13e778f52d574e615b0b19b74
Sergio Giro [Tue, 24 May 2016 11:56:50 +0000 (11:56 +0000)]
Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote"
Android Build Merger (Role) [Tue, 24 May 2016 10:51:37 +0000 (10:51 +0000)]
Merge "Merge "Load WebView even if WebView relro creation times out." into nyc-dev am:
a2fbfbce9e am:
a44129dd55" into nyc-mr1-dev-plus-aosp
Gustav Sennton [Tue, 24 May 2016 10:51:01 +0000 (10:51 +0000)]
Merge "Load WebView even if WebView relro creation times out." into nyc-dev am:
a2fbfbce9e
am:
a44129dd55
* commit '
a44129dd5518c1890f2301baea7e03972408e270':
Load WebView even if WebView relro creation times out.
Change-Id: I5f0a0df8a08eafcfa10d63597c9ce8af3496c900
Gustav Sennton [Tue, 24 May 2016 10:50:56 +0000 (10:50 +0000)]
Merge "Load WebView even if WebView relro creation times out." into nyc-dev am:
a2fbfbce9e
am:
930ad20ef4
* commit '
930ad20ef492a02994ad8efec9821c0fb46e5ba2':
Load WebView even if WebView relro creation times out.
Change-Id: I043822e0eb95fb540d68a903ed87855c1340f70b
Gustav Sennton [Tue, 24 May 2016 10:46:29 +0000 (10:46 +0000)]
Merge "Load WebView even if WebView relro creation times out." into nyc-dev
am:
a2fbfbce9e
* commit '
a2fbfbce9ef09ed7a98222e67709aa086e548c79':
Load WebView even if WebView relro creation times out.
Change-Id: Iae015c9bc199836db71553cbbcea7d8842eb8dda
Gustav Sennton [Tue, 24 May 2016 10:46:16 +0000 (10:46 +0000)]
Merge "Load WebView even if WebView relro creation times out." into nyc-dev
am:
a2fbfbce9e
* commit '
a2fbfbce9ef09ed7a98222e67709aa086e548c79':
Load WebView even if WebView relro creation times out.
Change-Id: Icf6e99e3f3dfc9b1f4244f5da63e32b3d741459c
Gustav Sennton [Tue, 24 May 2016 10:39:31 +0000 (10:39 +0000)]
Merge "Load WebView even if WebView relro creation times out." into nyc-dev
Android Build Merger (Role) [Tue, 24 May 2016 03:22:44 +0000 (03:22 +0000)]
Merge "Merge "Support IPv6 multicast filtering in APF." into nyc-dev am:
d954c6368f am:
09a2690f91" into nyc-mr1-dev-plus-aosp
Lorenzo Colitti [Tue, 24 May 2016 03:22:15 +0000 (03:22 +0000)]
Merge "Support IPv6 multicast filtering in APF." into nyc-dev am:
d954c6368f
am:
09a2690f91
* commit '
09a2690f91b32a6be57d92ced7e13ee6b683ed24':
Support IPv6 multicast filtering in APF.
Change-Id: I68e937bbeab2285528b5fed7a298daaf5500f924
Lorenzo Colitti [Tue, 24 May 2016 03:22:11 +0000 (03:22 +0000)]
Merge "Support IPv6 multicast filtering in APF." into nyc-dev am:
d954c6368f
am:
50282f0cb7
* commit '
50282f0cb7bbdd117cb31db3b127adb0f4f196a0':
Support IPv6 multicast filtering in APF.
Change-Id: I58cb62ff0bb5304d614b8eb61da148c6a5d94bed
Lorenzo Colitti [Tue, 24 May 2016 03:19:32 +0000 (03:19 +0000)]
Merge "Support IPv6 multicast filtering in APF." into nyc-dev
am:
d954c6368f
* commit '
d954c6368fc6e591385e608fa6ebb42dc7606074':
Support IPv6 multicast filtering in APF.
Change-Id: I99641c19b2b0014d313e281070d5888a3759588f
Lorenzo Colitti [Tue, 24 May 2016 03:19:29 +0000 (03:19 +0000)]
Merge "Support IPv6 multicast filtering in APF." into nyc-dev
am:
d954c6368f
* commit '
d954c6368fc6e591385e608fa6ebb42dc7606074':
Support IPv6 multicast filtering in APF.
Change-Id: I6123c2390aa9641652fd200adcc16f9724799aab
Lorenzo Colitti [Tue, 24 May 2016 03:14:37 +0000 (03:14 +0000)]
Merge "Support IPv6 multicast filtering in APF." into nyc-dev
Android Build Merger (Role) [Tue, 24 May 2016 02:39:30 +0000 (02:39 +0000)]
Merge "Reduced the impact of "synchronized" statements am:
eb50a39e98 am:
c6a3503100" into nyc-mr1-dev-plus-aosp
Pavlin Radoslavov [Tue, 24 May 2016 02:38:31 +0000 (02:38 +0000)]
Reduced the impact of "synchronized" statements am:
eb50a39e98
am:
c6a3503100
* commit '
c6a35031005c24eaa2e6592218d3e653ff623668':
Reduced the impact of "synchronized" statements
Change-Id: I87af74e9dd74f18cac98144763a866a847bbfe21
Pavlin Radoslavov [Tue, 24 May 2016 02:38:29 +0000 (02:38 +0000)]
Reduced the impact of "synchronized" statements am:
eb50a39e98
am:
13b1a15db0
* commit '
13b1a15db07b2187b8a134f54e574e2c6a76dadc':
Reduced the impact of "synchronized" statements
Change-Id: I84d731281a7424a6d9fe4ae633f47a97a0446aa7
Pavlin Radoslavov [Tue, 24 May 2016 02:34:28 +0000 (02:34 +0000)]
Reduced the impact of "synchronized" statements
am:
eb50a39e98
* commit '
eb50a39e98acb78d16465041bb5c172aa1637e97':
Reduced the impact of "synchronized" statements
Change-Id: I60a4b0e656b283f83c49c3c0211943b4854867e0
Pavlin Radoslavov [Tue, 24 May 2016 02:34:23 +0000 (02:34 +0000)]
Reduced the impact of "synchronized" statements
am:
eb50a39e98
* commit '
eb50a39e98acb78d16465041bb5c172aa1637e97':
Reduced the impact of "synchronized" statements
Change-Id: I272dba69e9011720356a3c5b9ca849de281f5027
Suprabh Shukla [Tue, 24 May 2016 02:31:46 +0000 (02:31 +0000)]
Merge "Adding RetailModeService to handle retail mode" into nyc-mr1-dev
am:
a09c9e0fc4
* commit '
a09c9e0fc48816096349aac8960a3b49101d90a3':
Adding RetailModeService to handle retail mode
Change-Id: I8ac04712c319eeb4ff8087ea828331bdb0450867
TreeHugger Robot [Tue, 24 May 2016 02:24:49 +0000 (02:24 +0000)]
Merge "Adding RetailModeService to handle retail mode" into nyc-mr1-dev
Pavlin Radoslavov [Mon, 23 May 2016 05:16:41 +0000 (22:16 -0700)]
Reduced the impact of "synchronized" statements
* Removed "synchronized" statements that are not needed
* Replaced "synchronized" statements with Read/Write lock as
appropriate. The lock protects the access to and the setting of
BluetoothAdapter.mService and BluetoothManagerService.mBluetooth and
associated state.
Bug:
28734075
Bug:
28799467
Change-Id: I8f8281c505f0a1ae0add1e14a3caba1f5b2a98e4
Suprabh Shukla [Fri, 20 May 2016 21:41:22 +0000 (14:41 -0700)]
Adding RetailModeService to handle retail mode
The service listens for the global setting DEVICE_DEMO_MODE and switches
device to demo mode when it is changed to 1. Also, acquires the wakelock
to
keep the screen on and puts up a notification to wipe and reset the demo
session when in demo mode.
Bug:
27280140
Change-Id: If1843016889ec2c50818c67432d60f33063e0986
Dianne Hackborn [Tue, 24 May 2016 00:39:23 +0000 (00:39 +0000)]
Merge "Fix issue #
28868955: CTS: PendingIntentTest failures; Regressed in NRD48x" into nyc-dev am:
9c252700f6
am:
f7003f512f
* commit '
f7003f512f055614c1e297c9c19192a68cbf6794':
Change-Id: Ie93c870ac3c79820e1dc59aad08956fc159bf9c8
Jaewan Kim [Tue, 24 May 2016 00:35:36 +0000 (00:35 +0000)]
Merge "PIP: Handle configuration changes" into nyc-dev am:
75822138ad
am:
74ebf3ec67
* commit '
74ebf3ec67ddbbf7752da120a57c4624d4e1655f':
Fix issue #
28868955: CTS: PendingIntentTest failures; Regressed in NRD48x
Change-Id: I6c01fb9689735a6214bd9f3b29d4dd50a8744388
Android Build Merger (Role) [Tue, 24 May 2016 00:31:05 +0000 (00:31 +0000)]
Merge "Merge "PIP: Handle configuration changes" into nyc-dev am:
75822138ad am:
938c4e3564" into nyc-mr1-dev-plus-aosp
Jaewan Kim [Tue, 24 May 2016 00:30:38 +0000 (00:30 +0000)]
Merge "PIP: Handle configuration changes" into nyc-dev am:
75822138ad
am:
b917a0e6be
* commit '
b917a0e6be841d23ff56c54b03abb42b3a93d930':
PIP: Handle configuration changes
Change-Id: I018fc45368eff5fbe9ba5d6f21b00d616e622010
Dianne Hackborn [Tue, 24 May 2016 00:30:32 +0000 (00:30 +0000)]
Merge "Fix issue #
28868955: CTS: PendingIntentTest failures; Regressed in NRD48x" into nyc-dev
am:
9c252700f6
* commit '
9c252700f6686767f5418677800ba171f441dddc':
Fix issue #
28868955: CTS: PendingIntentTest failures; Regressed in NRD48x
Change-Id: Ib2811fb49299da93459066d9d6312d403681eed4
Jaewan Kim [Tue, 24 May 2016 00:30:32 +0000 (00:30 +0000)]
Merge "PIP: Handle configuration changes" into nyc-dev am:
75822138ad
am:
938c4e3564
* commit '
938c4e356417360e161dcf7a9eba2524f13373f0':
PIP: Handle configuration changes
Change-Id: Ida8a222a813f462e3b6766c572d53ffcf7995e78
Dianne Hackborn [Tue, 24 May 2016 00:30:30 +0000 (00:30 +0000)]
Merge "Fix issue #
28868955: CTS: PendingIntentTest failures; Regressed in NRD48x" into nyc-dev
am:
9c252700f6
* commit '
9c252700f6686767f5418677800ba171f441dddc':
Fix issue #
28868955: CTS: PendingIntentTest failures; Regressed in NRD48x
Change-Id: I9f3aa6eedbf66eceee0fcaed95a862bea656e359
Jaewan Kim [Tue, 24 May 2016 00:22:31 +0000 (00:22 +0000)]
Merge "PIP: Handle configuration changes" into nyc-dev
am:
75822138ad
* commit '
75822138ad7f676592c5655df96fe76200b6ffb3':
PIP: Handle configuration changes
Change-Id: I976b3e89aa4bc255138f411c855ab0ad1d8c50bd
Jaewan Kim [Tue, 24 May 2016 00:22:27 +0000 (00:22 +0000)]
Merge "PIP: Handle configuration changes" into nyc-dev
am:
75822138ad
* commit '
75822138ad7f676592c5655df96fe76200b6ffb3':
PIP: Handle configuration changes
Change-Id: Ic01a93b2031693b9051312598c084e871d84fedc
Dianne Hackborn [Tue, 24 May 2016 00:18:38 +0000 (00:18 +0000)]
Merge "Fix issue #
28868955: CTS: PendingIntentTest failures; Regressed in NRD48x" into nyc-dev
Jaewan Kim [Tue, 24 May 2016 00:05:26 +0000 (00:05 +0000)]
Merge "PIP: Handle configuration changes" into nyc-dev
Android Build Merger (Role) [Mon, 23 May 2016 23:38:29 +0000 (23:38 +0000)]
Merge "Merge "Support DHCPv4 rebinding state" into nyc-dev am:
4bf3157c45 am:
b21c227a39" into nyc-mr1-dev-plus-aosp
Erik Kline [Mon, 23 May 2016 23:37:58 +0000 (23:37 +0000)]
Merge "Support DHCPv4 rebinding state" into nyc-dev am:
4bf3157c45
am:
b21c227a39
* commit '
b21c227a39df2bec9488e9eabec9dfe6e34b9bb5':
Support DHCPv4 rebinding state
Change-Id: Ib880d8bdd9230b76247ffadeef66b2a11dae2435
Erik Kline [Mon, 23 May 2016 23:37:42 +0000 (23:37 +0000)]
Merge "Support DHCPv4 rebinding state" into nyc-dev am:
4bf3157c45
am:
648d51fc5d
* commit '
648d51fc5dfcbb7c9b33f247eb0b32631d34835d':
Support DHCPv4 rebinding state
Change-Id: I171247f1a930f97b361a774f74a90b29aad84fc7
Erik Kline [Mon, 23 May 2016 23:29:07 +0000 (23:29 +0000)]
Merge "Support DHCPv4 rebinding state" into nyc-dev
am:
4bf3157c45
* commit '
4bf3157c4560148b9b3f2e6aec7ed0835f6af14a':
Support DHCPv4 rebinding state
Change-Id: I885181616444d19974085637f80f459c9152ac7d
Erik Kline [Mon, 23 May 2016 23:28:57 +0000 (23:28 +0000)]
Merge "Support DHCPv4 rebinding state" into nyc-dev
am:
4bf3157c45
* commit '
4bf3157c4560148b9b3f2e6aec7ed0835f6af14a':
Support DHCPv4 rebinding state
Change-Id: If31de53174e64e154152b7baa60f23a387092e87
Adrian Roos [Mon, 23 May 2016 23:28:37 +0000 (23:28 +0000)]
Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev am:
d15cc7a83e
am:
3067da37c1
* commit '
3067da37c1e945245274ae638373f200d0ff2d29':
Additional clean up in onUserRemovedLPw
Change-Id: I845144d4487a39973427f39c0b93b5a8acbc9f9b
Android Build Merger (Role) [Mon, 23 May 2016 23:24:32 +0000 (23:24 +0000)]
Merge "Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev am:
d15cc7a83e am:
6d2e1e45f0" into nyc-mr1-dev-plus-aosp
Adrian Roos [Mon, 23 May 2016 23:23:55 +0000 (23:23 +0000)]
Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev am:
d15cc7a83e
am:
6d2e1e45f0
* commit '
6d2e1e45f008f1f179fee4d5c966dfdbb31b45ed':
Deprecate unnecessairy Notification.Style constructors
Change-Id: I7c420fe8cf54cb3e08341a073d5abd7ce0d0ebd7
Adrian Roos [Mon, 23 May 2016 23:23:40 +0000 (23:23 +0000)]
Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev am:
d15cc7a83e
am:
80c470bd52
* commit '
80c470bd52af8b5db26cc0aae24da10135883c0d':
Deprecate unnecessairy Notification.Style constructors
Change-Id: I9a4309d22dbc58081387771ec228c32e2db2cf84
Erik Kline [Mon, 23 May 2016 23:19:03 +0000 (23:19 +0000)]
Merge "Support DHCPv4 rebinding state" into nyc-dev
Fyodor Kupolov [Mon, 23 May 2016 23:18:15 +0000 (23:18 +0000)]
Merge "Additional clean up in onUserRemovedLPw" into nyc-mr1-dev
Adrian Roos [Mon, 23 May 2016 23:15:29 +0000 (23:15 +0000)]
Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev
am:
d15cc7a83e
* commit '
d15cc7a83e8d6251d4cf78bb08ee26b9ae949b58':
Deprecate unnecessairy Notification.Style constructors
Change-Id: I584f2e8ce46358ecdcb1189f3e46400d6f07d346
Adrian Roos [Mon, 23 May 2016 23:14:35 +0000 (23:14 +0000)]
Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev
am:
d15cc7a83e
* commit '
d15cc7a83e8d6251d4cf78bb08ee26b9ae949b58':
Deprecate unnecessairy Notification.Style constructors
Change-Id: I35dac10df46e313fbe013fcc09337f8e9ac95890
TreeHugger Robot [Mon, 23 May 2016 23:04:35 +0000 (23:04 +0000)]
Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev
Dianne Hackborn [Mon, 23 May 2016 21:39:45 +0000 (14:39 -0700)]
Fix issue #
28868955: CTS: PendingIntentTest failures; Regressed in NRD48x
Uh, yeah.
Change-Id: I452187fcdda634ebf00e5d6bcaa45433f348c17e
Fyodor Kupolov [Mon, 23 May 2016 21:22:38 +0000 (14:22 -0700)]
Additional clean up in onUserRemovedLPw
mDefaultPermissionsGranted, mFingerprints should be cleaned up.
Bug:
28913107
Change-Id: I3758985fe742d38e43538b5221fc3f436c55cb16
Android Build Merger (Role) [Mon, 23 May 2016 21:11:43 +0000 (21:11 +0000)]
Merge "Merge "Recording activity notification: return list of configuration" into nyc-dev am:
c991879f29 am:
7399079b5b" into nyc-mr1-dev-plus-aosp
Jean-Michel Trivi [Mon, 23 May 2016 21:10:26 +0000 (21:10 +0000)]
Merge "Recording activity notification: return list of configuration" into nyc-dev am:
c991879f29
am:
7399079b5b
* commit '
7399079b5b6af59aceba6c4a4070fdf7afe432c0':
Only resuming starting dontWaitForPause activity once
Change-Id: I28a1b0fb32c521ae990e96375fdb819dc12c95ca
Wale Ogunwale [Mon, 23 May 2016 21:10:09 +0000 (21:10 +0000)]
Merge "Only resuming starting dontWaitForPause activity once" into nyc-dev am:
42d4a337a3
am:
22ff8d0779
* commit '
22ff8d07796a9fc382bc364bae490dec9d258ec5':
Only resuming starting dontWaitForPause activity once
Change-Id: Idd556009a345aee1b7166934aaccfbd4c2e1787f
Android Build Merger (Role) [Mon, 23 May 2016 21:07:20 +0000 (21:07 +0000)]
Merge "Merge "Recording activity notification: return list of configuration" into nyc-dev am:
c991879f29 am:
bbcf18dbfd" into nyc-mr1-dev-plus-aosp
Jean-Michel Trivi [Mon, 23 May 2016 21:06:33 +0000 (21:06 +0000)]
Merge "Recording activity notification: return list of configuration" into nyc-dev am:
c991879f29
am:
bbcf18dbfd
* commit '
bbcf18dbfd7e3e96ee14b1ee30b6ba99f99ff252':
Recording activity notification: return list of configuration
Change-Id: Ia0456b55cb097f2c5d2206f898c72bed90b867c2
Jean-Michel Trivi [Mon, 23 May 2016 21:06:05 +0000 (21:06 +0000)]
Merge "Recording activity notification: return list of configuration" into nyc-dev am:
c991879f29
am:
f2c8fb8620
* commit '
f2c8fb8620224eecfbc344a203e32e6563afcfd6':
Recording activity notification: return list of configuration
Change-Id: I795d0a76efd044630cd275060dd6c11d595f0e82
Adrian Roos [Mon, 23 May 2016 20:56:15 +0000 (13:56 -0700)]
Deprecate unnecessairy Notification.Style constructors
Change-Id: I7a15eaaac4f756d137483aec5f389951c5a7eecb
Fixes:
28775574
Wale Ogunwale [Mon, 23 May 2016 20:59:00 +0000 (20:59 +0000)]
Merge "Only resuming starting dontWaitForPause activity once" into nyc-dev
am:
42d4a337a3
* commit '
42d4a337a3b1a14f4d9daf6eb8275a01ba20e680':
Only resuming starting dontWaitForPause activity once
Change-Id: I5cc6a322d6c3cdd9bd28ea4a996fe960b1cefd81
Wale Ogunwale [Mon, 23 May 2016 20:58:58 +0000 (20:58 +0000)]
Merge "Only resuming starting dontWaitForPause activity once" into nyc-dev
am:
42d4a337a3
* commit '
42d4a337a3b1a14f4d9daf6eb8275a01ba20e680':
Only resuming starting dontWaitForPause activity once
Change-Id: Idb9949737a0ee5cfbabd6fad532f24f7ec769ace
Jean-Michel Trivi [Mon, 23 May 2016 20:56:04 +0000 (20:56 +0000)]
Merge "Recording activity notification: return list of configuration" into nyc-dev
am:
c991879f29
* commit '
c991879f29c399ad7ede2b5c2c82e2e748f5e0df':
Recording activity notification: return list of configuration
Change-Id: I926b2cacd7a645ec42f249a0d45a6a822f05eded
Jean-Michel Trivi [Mon, 23 May 2016 20:55:58 +0000 (20:55 +0000)]
Merge "Recording activity notification: return list of configuration" into nyc-dev
am:
c991879f29
* commit '
c991879f29c399ad7ede2b5c2c82e2e748f5e0df':
Recording activity notification: return list of configuration
Change-Id: I02faeadaae995371e2d723415f0b2e3a78f2c489
TreeHugger Robot [Mon, 23 May 2016 20:51:39 +0000 (20:51 +0000)]
Merge "Only resuming starting dontWaitForPause activity once" into nyc-dev
Jean-Michel Trivi [Mon, 23 May 2016 20:49:28 +0000 (20:49 +0000)]
Merge "Recording activity notification: return list of configuration" into nyc-dev
Jason Monk [Mon, 23 May 2016 20:10:23 +0000 (20:10 +0000)]
Merge "Make battery labels translatable." into nyc-dev am:
14abed66d7
am:
ae8b7259f5
* commit '
ae8b7259f59eb3208517f6e3558b9ba991f39b96':
Change-Id: Iebc60c74712a3d1b259f7d10d68aee850be79cc5
Android Build Merger (Role) [Mon, 23 May 2016 20:07:57 +0000 (20:07 +0000)]
Merge "Merge "Make battery labels translatable." into nyc-dev am:
14abed66d7 am:
7143013049" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 23 May 2016 20:07:47 +0000 (20:07 +0000)]
Merge "Merge "Add a check to adjust thumbnail scaling for full screen shots on TV" into nyc-dev am:
0513125c92 am:
7f26540426" into nyc-mr1-dev-plus-aosp
Jason Monk [Mon, 23 May 2016 20:07:16 +0000 (20:07 +0000)]
Merge "Make battery labels translatable." into nyc-dev am:
14abed66d7
am:
7143013049
* commit '
71430130496299138f1f65875a2162927883412e':
Make battery labels translatable.
Change-Id: I503c0c66b06e076dfa2ea36f6a14828cbc7c5d6b
Sid Soundararajan [Mon, 23 May 2016 20:07:12 +0000 (20:07 +0000)]
Merge "Add a check to adjust thumbnail scaling for full screen shots on TV" into nyc-dev am:
0513125c92
am:
7f26540426
* commit '
7f2654042655d32714cc59fd857f24fc7b284f77':
Add a check to adjust thumbnail scaling for full screen shots on TV
Change-Id: I3aba988e5e61c51d67180aad0d7eb1f41b78c245
Jason Monk [Mon, 23 May 2016 20:07:08 +0000 (20:07 +0000)]
Merge "Make battery labels translatable." into nyc-dev
am:
14abed66d7
* commit '
14abed66d7a70c3fc8e063246e3f79a0a53dfcd3':
Make battery labels translatable.
Change-Id: Ic945adf122822b17d91ade4cf0a1d7eb4e6b4cb9
Sid Soundararajan [Mon, 23 May 2016 20:07:01 +0000 (20:07 +0000)]
Merge "Add a check to adjust thumbnail scaling for full screen shots on TV" into nyc-dev am:
0513125c92
am:
809bb0f195
* commit '
809bb0f1957d92e9fc3a84c56573dddd6ce50162':
Add a check to adjust thumbnail scaling for full screen shots on TV
Change-Id: Icd9595a35f31b4e669bf6e66afd2073fc170e274
Jason Monk [Mon, 23 May 2016 20:03:51 +0000 (20:03 +0000)]
Merge "Make battery labels translatable." into nyc-dev
am:
14abed66d7
* commit '
14abed66d7a70c3fc8e063246e3f79a0a53dfcd3':
Make battery labels translatable.
Change-Id: I634eca6f143a5a6d103f49107e57db879b2ca633
Sid Soundararajan [Mon, 23 May 2016 20:01:38 +0000 (20:01 +0000)]
Merge "Add a check to adjust thumbnail scaling for full screen shots on TV" into nyc-dev
am:
0513125c92
* commit '
0513125c92789912214235faad26e7a97184a53a':
Add a check to adjust thumbnail scaling for full screen shots on TV
Change-Id: I617796ca2d7476801517587cf81f29f8edc93d2d
Sid Soundararajan [Mon, 23 May 2016 20:01:03 +0000 (20:01 +0000)]
Merge "Add a check to adjust thumbnail scaling for full screen shots on TV" into nyc-dev
am:
0513125c92
* commit '
0513125c92789912214235faad26e7a97184a53a':
Add a check to adjust thumbnail scaling for full screen shots on TV
Change-Id: I057727feb949fc864c3396ef53f9fba331f65ba8
Jason Monk [Mon, 23 May 2016 19:58:48 +0000 (19:58 +0000)]
Merge "Make battery labels translatable." into nyc-dev
Sid Soundararajan [Mon, 23 May 2016 19:56:42 +0000 (19:56 +0000)]
Merge "Add a check to adjust thumbnail scaling for full screen shots on TV" into nyc-dev
Android Build Merger (Role) [Mon, 23 May 2016 19:54:31 +0000 (19:54 +0000)]
Merge "Merge "Add data from /proc/pagetypeinfo to procstats." into nyc-dev am:
4dbdd5d971 am:
97cdd11f2a" into nyc-mr1-dev-plus-aosp
Joe Onorato [Mon, 23 May 2016 19:54:10 +0000 (19:54 +0000)]
Merge "Add data from /proc/pagetypeinfo to procstats." into nyc-dev am:
4dbdd5d971
am:
c3db3e217f
* commit '
c3db3e217f397153e9982bb29e37fc28e01062d2':
Add data from /proc/pagetypeinfo to procstats.
Change-Id: Iddfcdfeb0ad1194488ce504d420696a83d20a786
Joe Onorato [Mon, 23 May 2016 19:54:10 +0000 (19:54 +0000)]
Merge "Add data from /proc/pagetypeinfo to procstats." into nyc-dev am:
4dbdd5d971
am:
97cdd11f2a
* commit '
97cdd11f2a46a9919a615436dd0ddeeb88945c61':
Add data from /proc/pagetypeinfo to procstats.
Change-Id: I19c639267c69783a975361f5aa5fae083e5eb695
Joe Onorato [Mon, 23 May 2016 19:50:45 +0000 (19:50 +0000)]
Merge "Add data from /proc/pagetypeinfo to procstats." into nyc-dev
am:
4dbdd5d971
* commit '
4dbdd5d97155364305abf7c010c165f1a6f79edb':
Add data from /proc/pagetypeinfo to procstats.
Change-Id: Ic86eb0ad4278dc2d0b7f93148bab00a1f707dc16
Joe Onorato [Mon, 23 May 2016 19:50:36 +0000 (19:50 +0000)]
Merge "Add data from /proc/pagetypeinfo to procstats." into nyc-dev
am:
4dbdd5d971
* commit '
4dbdd5d97155364305abf7c010c165f1a6f79edb':
Add data from /proc/pagetypeinfo to procstats.
Change-Id: I3c455fe69244927dc5aebdf5ddb7b0badf6aeee8
OSDN Git Service
