git.osdn.net Git - android-x86/frameworks-base.git/log

Eric Laurent [Thu, 21 Apr 2016 18:28:38 +0000 (18:28 +0000)]

Merge "AudioManager: fix isBluetoothA2dpOn()" into nyc-dev am: dc7ce84095
am: 0bf32f0589

* commit '0bf32f0589efc3412af702ce370d7a79432e4ec7':
AudioManager: fix isBluetoothA2dpOn()

Change-Id: I30868022115cd389036efed24189f1f26c21c3af

commit | commitdiff | tree

Eric Laurent [Thu, 21 Apr 2016 18:26:19 +0000 (18:26 +0000)]

Merge "AudioManager: fix isBluetoothA2dpOn()" into nyc-dev
am: dc7ce84095

* commit 'dc7ce840950398518cc116924b173eb7b7f3288a':
AudioManager: fix isBluetoothA2dpOn()

Change-Id: I7df2a9258ef34716a9a34a47bc501619c3d9ead3

commit | commitdiff | tree

Eric Laurent [Thu, 21 Apr 2016 18:22:57 +0000 (18:22 +0000)]

Merge "AudioManager: fix isBluetoothA2dpOn()" into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 18:19:38 +0000 (18:19 +0000)]

Merge "Merge "Fix dead surface/window left on screen" into nyc-dev am: 289395b1fe am: 31e3b5c065" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Chong Zhang [Thu, 21 Apr 2016 18:19:15 +0000 (18:19 +0000)]

Merge "Fix dead surface/window left on screen" into nyc-dev am: 289395b1fe
am: 31e3b5c065

* commit '31e3b5c065d596b5a1a8d0638183ac737414f913':

Change-Id: I00caf1bea81a1152eaa47c7a3c9e93c6345af61a

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 18:17:44 +0000 (18:17 +0000)]

Merge "Merge "Fix dead surface/window left on screen" into nyc-dev am: 289395b1fe am: 31e3b5c065" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Chong Zhang [Thu, 21 Apr 2016 18:17:19 +0000 (18:17 +0000)]

Merge "Fix dead surface/window left on screen" into nyc-dev am: 289395b1fe
am: 31e3b5c065

* commit '31e3b5c065d596b5a1a8d0638183ac737414f913':
Fix dead surface/window left on screen

Change-Id: I46664a5f9ca48557fab650385409e445267b109d

commit | commitdiff | tree

Chong Zhang [Thu, 21 Apr 2016 18:17:11 +0000 (18:17 +0000)]

Merge "Fix dead surface/window left on screen" into nyc-dev am: 289395b1fe
am: 786302f2fa

* commit '786302f2fa658740b1819bc53e3ca3e3f2b4e01e':
Fix dead surface/window left on screen

Change-Id: Ibba49102dbd1bdfe7aba4b5cf022b3c3c0098e9a

commit | commitdiff | tree

Chong Zhang [Thu, 21 Apr 2016 18:15:02 +0000 (18:15 +0000)]

Merge "Fix dead surface/window left on screen" into nyc-dev
am: 289395b1fe

* commit '289395b1feca65fc758384bb2d5c12f1c78500c1':
Fix dead surface/window left on screen

Change-Id: Idd818246a5ada66abc24806529848d8d25a2e383

commit | commitdiff | tree

Chong Zhang [Thu, 21 Apr 2016 18:14:59 +0000 (18:14 +0000)]

commit | commitdiff | tree

Chong Zhang [Thu, 21 Apr 2016 17:58:50 +0000 (17:58 +0000)]

Merge "Fix dead surface/window left on screen" into nyc-dev

commit | commitdiff | tree

Daniel Nishi [Thu, 21 Apr 2016 17:57:04 +0000 (17:57 +0000)]

Merge "Add a branded VPN icon for quick settings and status bar." into nyc-mr1-dev
am: 0cdb8177ea

* commit '0cdb8177eaa47a3a5d3c1ba5112bc3385b70c78a':
Add a branded VPN icon for quick settings and status bar.

Change-Id: I61b79cb9b3007116ad8b6c37987f511f1c623ddf

commit | commitdiff | tree

Daniel Nishi [Thu, 21 Apr 2016 17:39:59 +0000 (17:39 +0000)]

Merge "Add a branded VPN icon for quick settings and status bar." into nyc-mr1-dev

commit | commitdiff | tree

Yohei Yukawa [Thu, 21 Apr 2016 17:20:53 +0000 (17:20 +0000)]

Merge "Accept null subtype in InputMethodSubtypeHandle." into nyc-dev am: d67a1ca49b
am: e3512894af

* commit 'e3512894afbdc0f28b67e021edb76d0c5d13c2f7':

Change-Id: I6d9f12a9161fdd2ff0aaf0694ec21bdc500a69b5

commit | commitdiff | tree

Chris Craik [Thu, 21 Apr 2016 17:20:51 +0000 (17:20 +0000)]

Merge "Fix shadow radius too large for RS" into nyc-dev am: 924d8227c4
am: ef79274692

* commit 'ef7927469226df2a41f9b83528fc29787a439af9':

Change-Id: Ieb8c9e27439d822cf1c72fe5e4c6b08b77142d6c

commit | commitdiff | tree

Yohei Yukawa [Thu, 21 Apr 2016 17:18:38 +0000 (17:18 +0000)]

Merge "Accept null subtype in InputMethodSubtypeHandle." into nyc-dev am: d67a1ca49b
am: 1f79c0fea1

* commit '1f79c0fea1b8ed938fe77633739abcbee0f43456':
Accept null subtype in InputMethodSubtypeHandle.

Change-Id: I04c3bde21a2d837bcf04c43d9460818b00f6fd3d

commit | commitdiff | tree

Chris Craik [Thu, 21 Apr 2016 17:18:36 +0000 (17:18 +0000)]

Merge "Fix shadow radius too large for RS" into nyc-dev am: 924d8227c4
am: 4293527405

* commit '42935274055b0760a61d234f73a7c69bebc163f9':
Fix shadow radius too large for RS

Change-Id: I166302f76457272bfbd22dabbb8174ac6641a139

commit | commitdiff | tree

Yohei Yukawa [Thu, 21 Apr 2016 17:16:19 +0000 (17:16 +0000)]

Merge "Accept null subtype in InputMethodSubtypeHandle." into nyc-dev
am: d67a1ca49b

* commit 'd67a1ca49b138056d53490322ffdadef61d95fec':
Accept null subtype in InputMethodSubtypeHandle.

Change-Id: I8eb560fa0176836894164a9e7856d44bd0b91a09

commit | commitdiff | tree

Chris Craik [Thu, 21 Apr 2016 17:16:16 +0000 (17:16 +0000)]

Merge "Fix shadow radius too large for RS" into nyc-dev
am: 924d8227c4

* commit '924d8227c4c790f05fb90d6140de15fa8abb704b':
Fix shadow radius too large for RS

Change-Id: I14e606d89f456bedb240f564acc7867b629bf8ed

commit | commitdiff | tree

Yohei Yukawa [Thu, 21 Apr 2016 17:16:15 +0000 (17:16 +0000)]

commit | commitdiff | tree

Chris Craik [Thu, 21 Apr 2016 17:16:14 +0000 (17:16 +0000)]

Merge "Fix shadow radius too large for RS" into nyc-dev
am: 924d8227c4

* commit '924d8227c4c790f05fb90d6140de15fa8abb704b':
Fix shadow radius too large for RS

Change-Id: I165e946b30e47ba711efb23996ec9d08b0043310

commit | commitdiff | tree

Yohei Yukawa [Thu, 21 Apr 2016 17:11:53 +0000 (17:11 +0000)]

Merge "Accept null subtype in InputMethodSubtypeHandle." into nyc-dev

commit | commitdiff | tree

Chris Craik [Thu, 21 Apr 2016 17:09:02 +0000 (17:09 +0000)]

Merge "Fix shadow radius too large for RS" into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 16:36:22 +0000 (16:36 +0000)]

Merge "Merge "PIP: Fix system UI crash" into nyc-dev am: 28d9c9f7b2 am: 552c5af941" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Youngsang Cho [Thu, 21 Apr 2016 16:35:55 +0000 (16:35 +0000)]

Merge "PIP: Fix system UI crash" into nyc-dev am: 28d9c9f7b2
am: 552c5af941

* commit '552c5af941ad45fb9132807e3e3e341b05c44eaa':

Change-Id: Ie5bd40a5217495ec549211709baf60ed885b3fa1

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 16:34:21 +0000 (16:34 +0000)]

Merge "Merge "PIP: Fix system UI crash" into nyc-dev am: 28d9c9f7b2 am: 552c5af941" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Youngsang Cho [Thu, 21 Apr 2016 16:33:57 +0000 (16:33 +0000)]

Merge "PIP: Fix system UI crash" into nyc-dev am: 28d9c9f7b2
am: 552c5af941

* commit '552c5af941ad45fb9132807e3e3e341b05c44eaa':
PIP: Fix system UI crash

Change-Id: I11bfc92d3cde5c62757d79fa7426192ec33eedae

commit | commitdiff | tree

Youngsang Cho [Thu, 21 Apr 2016 16:33:54 +0000 (16:33 +0000)]

Merge "PIP: Fix system UI crash" into nyc-dev am: 28d9c9f7b2
am: a7932ad290

* commit 'a7932ad29048f3b430a01a14c310e1718c35114c':
PIP: Fix system UI crash

Change-Id: I3b862c6f01bf05407cf4655a1bd48e732df52084

commit | commitdiff | tree

Jaewan Kim [Thu, 21 Apr 2016 16:31:43 +0000 (16:31 +0000)]

Merge "PIP: Fix system UI crash" into nyc-dev
am: 28d9c9f7b2

* commit '28d9c9f7b2498d5b81bdfbf6cabc955c4a2ecec9':
PIP: Fix system UI crash

Change-Id: If073cb6c099d05abd99674b461bc46fbd377c9c2

commit | commitdiff | tree

Jaewan Kim [Thu, 21 Apr 2016 16:31:42 +0000 (16:31 +0000)]

Merge "PIP: Fix system UI crash" into nyc-dev
am: 28d9c9f7b2

* commit '28d9c9f7b2498d5b81bdfbf6cabc955c4a2ecec9':
PIP: Fix system UI crash

Change-Id: Ief778c79108ac6d2eb5e7b2406f9c6d1da6c8ca7

commit | commitdiff | tree

Youngsang Cho [Thu, 21 Apr 2016 16:23:00 +0000 (16:23 +0000)]

Merge "PIP: Fix system UI crash" into nyc-dev

commit | commitdiff | tree

Tony Mak [Thu, 21 Apr 2016 15:58:21 +0000 (15:58 +0000)]

Merge "Fix wrong app is launched after solving challenge from tapping notification" into nyc-dev am: d3589ee715
am: c3bd9dc93f

* commit 'c3bd9dc93fa27b7fe96ed1870fa05074c9438266':

Change-Id: Ib2ec0d403ccac5ed35f08c559217ddda2684b3b4

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 15:58:18 +0000 (15:58 +0000)]

Merge "Accept the calendar name in addition to the owner as a calendar filter." into nyc-dev am: 54a6394cf9
am: 49ac59197a

* commit '49ac59197aa35eafcb7f24bf6bf6332a49a0b9e9':

Change-Id: I9a54c8d213c921979ae361c30cde1c6f7f2f2804

commit | commitdiff | tree

Tony Mak [Thu, 21 Apr 2016 15:56:15 +0000 (15:56 +0000)]

Merge "Fix wrong app is launched after solving challenge from tapping notification" into nyc-dev am: d3589ee715
am: f5f982f014

* commit 'f5f982f0148f04f1bdf05312a9770f137e8dda54':
Fix wrong app is launched after solving challenge from tapping notification

Change-Id: If7fbf80682d5c7583f3cec37dd6e807a0067ac18

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 15:56:13 +0000 (15:56 +0000)]

Merge "Accept the calendar name in addition to the owner as a calendar filter." into nyc-dev am: 54a6394cf9
am: ccd8b64b88

* commit 'ccd8b64b88572f123d138a336f72e8fcc99aabe1':
Accept the calendar name in addition to the owner as a calendar filter.

Change-Id: Icbb2bd0b0f2f175e7120b1e2868efe6863defde7

commit | commitdiff | tree

Tony Mak [Thu, 21 Apr 2016 15:56:06 +0000 (15:56 +0000)]

Merge "Fix wrong app is launched after solving challenge from tapping notification" into nyc-dev
am: d3589ee715

* commit 'd3589ee715e397e61025265adc883c9ed3be4f56':
Fix wrong app is launched after solving challenge from tapping notification

Change-Id: I9de441cca7574620fb3917adddbd911a8a935854

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 15:56:04 +0000 (15:56 +0000)]

Merge "Accept the calendar name in addition to the owner as a calendar filter." into nyc-dev
am: 54a6394cf9

* commit '54a6394cf96423936e6f3548ed8d78ff82e6b247':
Accept the calendar name in addition to the owner as a calendar filter.

Change-Id: Id788bb4465b947d6b5515a3c1d560c337ea5c382

commit | commitdiff | tree

Tony Mak [Thu, 21 Apr 2016 15:53:57 +0000 (15:53 +0000)]

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 15:53:55 +0000 (15:53 +0000)]

commit | commitdiff | tree

Tony Mak [Thu, 21 Apr 2016 15:51:13 +0000 (15:51 +0000)]

Merge "Fix wrong app is launched after solving challenge from tapping notification" into nyc-dev

commit | commitdiff | tree

Tony Mak [Thu, 21 Apr 2016 15:43:08 +0000 (16:43 +0100)]

Fix wrong app is launched after solving challenge from tapping notification

PendingIntent.FLAG_ONE_SHOT is needed to prevent the PendingIntent being
reused.

Also, flag and activity option of credential intent in BaseStatusBar
is not same as the one in ActivityStarter. Added a new
function startConfirmDeviceCredentialIntent in AM to centralize it.

Change-Id: I2d9e5923ad5d4d012f10057c409c666c8ca299a3
Fix: 28309964

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 15:36:29 +0000 (15:36 +0000)]

Merge "Accept the calendar name in addition to the owner as a calendar filter." into nyc-dev

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 15:36:02 +0000 (15:36 +0000)]

Merge "Always reevaluate rules when a new service is added." into nyc-dev am: a8574a1dfa
am: f581bc8399

* commit 'f581bc8399b953c655eb6a6ce24e11c2d5e1a569':

Change-Id: I96b0567223e6ad4da3ab50f5646cbe9ecb8e29e7

commit | commitdiff | tree

Keith Cheung [Thu, 21 Apr 2016 15:35:58 +0000 (15:35 +0000)]

Merge "Include work app in battery optimization settings" into nyc-dev am: 39066abb59
am: b21712eceb

* commit 'b21712eceb0dc5e25f52d151df2956748afbbecd':

Change-Id: I99b12a3e45646644dac8bc74c9bd62e7064523e1

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 15:33:51 +0000 (15:33 +0000)]

Merge "Always reevaluate rules when a new service is added." into nyc-dev am: a8574a1dfa
am: f18655bd43

* commit 'f18655bd439f7c7996b585e02a4dc658d9230b46':
Always reevaluate rules when a new service is added.

Change-Id: I1fb7d9ef91deeac1559910b5c4d65807d074add4

commit | commitdiff | tree

Keith Cheung [Thu, 21 Apr 2016 15:33:49 +0000 (15:33 +0000)]

Merge "Include work app in battery optimization settings" into nyc-dev am: 39066abb59
am: 5b935c170a

* commit '5b935c170a1a746ad33da3d2383913508998db56':
Include work app in battery optimization settings

Change-Id: I437bafa953979a56314948b5d04e107317384aa3

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 15:31:47 +0000 (15:31 +0000)]

Merge "Always reevaluate rules when a new service is added." into nyc-dev
am: a8574a1dfa

* commit 'a8574a1dfaa45089d392ebf05a8a82e4d8a1d82e':
Always reevaluate rules when a new service is added.

Change-Id: Ia9098705c487402bd987a1b55aec69a58fc67780

commit | commitdiff | tree

Keith Cheung [Thu, 21 Apr 2016 15:31:46 +0000 (15:31 +0000)]

Merge "Include work app in battery optimization settings" into nyc-dev
am: 39066abb59

* commit '39066abb5929622a1918805bf85d19180c6dfe3d':
Include work app in battery optimization settings

Change-Id: I3603894e9aca5b1dbe2ed0f6615ac8467e470a82

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 15:31:20 +0000 (15:31 +0000)]

commit | commitdiff | tree

Keith Cheung [Thu, 21 Apr 2016 15:31:17 +0000 (15:31 +0000)]

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 15:24:03 +0000 (15:24 +0000)]

Merge "Always reevaluate rules when a new service is added." into nyc-dev

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 15:22:15 +0000 (15:22 +0000)]

Merge "Don\'t call into audiomanager holding a zen lock." into nyc-dev am: d0f2d1f9ac
am: bdfd3c836f

* commit 'bdfd3c836f637b9df5b48d160f55727b3c0b5cfa':

Change-Id: Idf0280d9caf6829fb5e9d0a9d62647bd724385fd

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 15:20:06 +0000 (15:20 +0000)]

Merge "Don\'t call into audiomanager holding a zen lock." into nyc-dev am: d0f2d1f9ac
am: e042a3fe57

* commit 'e042a3fe577b9c19540b6e08376ac068b9bc1ab0':
Don't call into audiomanager holding a zen lock.

Change-Id: Ieb42deb5da289cf6ffaa036483d811aeb40c63e3

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 15:18:12 +0000 (15:18 +0000)]

Merge "Don\'t call into audiomanager holding a zen lock." into nyc-dev
am: d0f2d1f9ac

* commit 'd0f2d1f9ace01c4e0581baa3f5eb0a694afca675':
Don't call into audiomanager holding a zen lock.

Change-Id: I8a7eee3478bca5d8bfd1262e68d136b58fda4884

commit | commitdiff | tree

Keith Cheung [Thu, 21 Apr 2016 15:18:06 +0000 (15:18 +0000)]

Merge "Include work app in battery optimization settings" into nyc-dev

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 15:17:41 +0000 (15:17 +0000)]

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 15:04:05 +0000 (15:04 +0000)]

Merge "Don't call into audiomanager holding a zen lock." into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 14:57:59 +0000 (14:57 +0000)]

Merge "Merge "Reinflate QS view on Locale configuration change" into nyc-dev am: 98c7c05dde am: aa9e0344fd" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Clara Bayarri [Thu, 21 Apr 2016 14:57:24 +0000 (14:57 +0000)]

Merge "Reinflate QS view on Locale configuration change" into nyc-dev am: 98c7c05dde
am: aa9e0344fd

* commit 'aa9e0344fdba1284ef9e45ac7764bb341056cfea':

Change-Id: I4caf450fc0bf01c6121bb8171f80d942c9cda88f

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 14:55:47 +0000 (14:55 +0000)]

Merge "Merge "Reinflate QS view on Locale configuration change" into nyc-dev am: 98c7c05dde am: aa9e0344fd" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Clara Bayarri [Thu, 21 Apr 2016 14:55:17 +0000 (14:55 +0000)]

Merge "Reinflate QS view on Locale configuration change" into nyc-dev am: 98c7c05dde
am: aa9e0344fd

* commit 'aa9e0344fdba1284ef9e45ac7764bb341056cfea':
Reinflate QS view on Locale configuration change

Change-Id: Ia804f0393825c5d6f74f9447216227ae7692c741

commit | commitdiff | tree

Clara Bayarri [Thu, 21 Apr 2016 14:55:09 +0000 (14:55 +0000)]

Merge "Reinflate QS view on Locale configuration change" into nyc-dev am: 98c7c05dde
am: b91447b4e4

* commit 'b91447b4e4080743e2fd41019d096892bea29e1b':
Reinflate QS view on Locale configuration change

Change-Id: I2e1cc51d006147836a057ebe64390e8a338804d5

commit | commitdiff | tree

Clara Bayarri [Thu, 21 Apr 2016 14:53:11 +0000 (14:53 +0000)]

Merge "Reinflate QS view on Locale configuration change" into nyc-dev
am: 98c7c05dde

* commit '98c7c05dde8c288a4eab680af31b030813b8c87f':
Reinflate QS view on Locale configuration change

Change-Id: Ie27dce5dcd654771580d8295cca202a23954278b

commit | commitdiff | tree

Clara Bayarri [Thu, 21 Apr 2016 14:52:39 +0000 (14:52 +0000)]

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 14:50:39 +0000 (14:50 +0000)]

Merge "Volume updates should appear continuous when changed by touch." into nyc-dev am: db042644d5
am: 7c9d631fe1

* commit '7c9d631fe125a9afe27fbcd9af6eb3bd3cdf4b94':

Change-Id: If0138c24b2ab58ea6d855784c59c3c0fe8ac809f

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 14:48:11 +0000 (14:48 +0000)]

Merge "Volume updates should appear continuous when changed by touch." into nyc-dev am: db042644d5
am: 8f7872a3d3

* commit '8f7872a3d35bfbf411b24f4149222817a59f93d5':
Volume updates should appear continuous when changed by touch.

Change-Id: Id5f8e2b16f7fea76c739fd6430ff0cadd583710c

commit | commitdiff | tree

Clara Bayarri [Thu, 21 Apr 2016 14:48:07 +0000 (14:48 +0000)]

Merge "Fix silent errors when launching Keyboard Shortcuts from Settings" into nyc-dev am: bcedd6b74f
am: d9603ecbe2

* commit 'd9603ecbe2b970981ad627dfee637c1bd3608f75':

Change-Id: I38555998d7c1cb720a30b3d052ee77e79f38a9ee

commit | commitdiff | tree

Clara Bayarri [Thu, 21 Apr 2016 14:47:14 +0000 (14:47 +0000)]

Merge "Reinflate QS view on Locale configuration change" into nyc-dev

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 14:46:16 +0000 (14:46 +0000)]

Merge "Volume updates should appear continuous when changed by touch." into nyc-dev
am: db042644d5

* commit 'db042644d5f724d1c21c2ddd424de70aaf0d4195':
Volume updates should appear continuous when changed by touch.

Change-Id: I56e41e7af655547b32f230951a5e978cb59f96fd

commit | commitdiff | tree

Clara Bayarri [Thu, 21 Apr 2016 14:45:58 +0000 (14:45 +0000)]

Merge "Fix silent errors when launching Keyboard Shortcuts from Settings" into nyc-dev am: bcedd6b74f
am: c56ff7d5e2

* commit 'c56ff7d5e230e80f89721593232c0ef0ce1ef14f':
Fix silent errors when launching Keyboard Shortcuts from Settings

Change-Id: I1a194ea2a87b22d7b8c7475b914e92aecc57f5fc

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 14:45:48 +0000 (14:45 +0000)]

commit | commitdiff | tree

Clara Bayarri [Thu, 21 Apr 2016 14:44:04 +0000 (14:44 +0000)]

Merge "Fix silent errors when launching Keyboard Shortcuts from Settings" into nyc-dev
am: bcedd6b74f

* commit 'bcedd6b74f717dddb2e3e37385d1b4a4e82d949a':
Fix silent errors when launching Keyboard Shortcuts from Settings

Change-Id: I43938e09b83271cf48ddfe6bb6f956332f415c18

commit | commitdiff | tree

Clara Bayarri [Thu, 21 Apr 2016 14:43:36 +0000 (14:43 +0000)]

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 14:24:27 +0000 (10:24 -0400)]

Always reevaluate rules when a new service is added.

Otherwise the condition providers may never get an
onSubscribe call and may not turn on at the right time.

Bug: 26981870
Change-Id: Ia622597f10cc26f7c34ece1748013655543f488f

commit | commitdiff | tree

Julia Reynolds [Tue, 19 Apr 2016 17:27:41 +0000 (13:27 -0400)]

Don't call into audiomanager holding a zen lock.

Bug: 27642196
Change-Id: Ib510f2ddf966f36b3670290a4f3f695bf6b7810e

commit | commitdiff | tree

TreeHugger Robot [Thu, 21 Apr 2016 14:33:48 +0000 (14:33 +0000)]

Merge "Volume updates should appear continuous when changed by touch." into nyc-dev

commit | commitdiff | tree

Clara Bayarri [Thu, 21 Apr 2016 14:28:57 +0000 (14:28 +0000)]

Merge "Fix silent errors when launching Keyboard Shortcuts from Settings" into nyc-dev

commit | commitdiff | tree

Paul Jensen [Thu, 21 Apr 2016 13:59:20 +0000 (13:59 +0000)]

Merge "Cap number of NetworkRequests a UID can make to 100" into nyc-dev am: 3f45105353
am: 861d45b5e1

* commit '861d45b5e14e6102f909ebd9479d8c7192d00740':

Change-Id: I8cf403ba6b276e3f205c0989d3f1ae6e2f462bd9

commit | commitdiff | tree

Paul Jensen [Thu, 21 Apr 2016 13:57:12 +0000 (13:57 +0000)]

Merge "Cap number of NetworkRequests a UID can make to 100" into nyc-dev am: 3f45105353
am: eedfc5457f

* commit 'eedfc5457f5b22f36bc69d8d5c1747cde8169c2a':
Cap number of NetworkRequests a UID can make to 100

Change-Id: I44df1d666f710f938951820227090c4dbbbb7293

commit | commitdiff | tree

Paul Jensen [Thu, 21 Apr 2016 13:55:25 +0000 (13:55 +0000)]

Merge "Cap number of NetworkRequests a UID can make to 100" into nyc-dev
am: 3f45105353

* commit '3f4510535397bf103d0299440a0299ff8bbeec28':
Cap number of NetworkRequests a UID can make to 100

Change-Id: I194acabb1f9e301d88a40af8ea1d088a3d2ec0d9

commit | commitdiff | tree

Paul Jensen [Thu, 21 Apr 2016 13:54:53 +0000 (13:54 +0000)]

commit | commitdiff | tree

Paul Jensen [Thu, 21 Apr 2016 13:47:11 +0000 (13:47 +0000)]

Merge "Cap number of NetworkRequests a UID can make to 100" into nyc-dev

commit | commitdiff | tree

Tobias Thierer [Thu, 21 Apr 2016 13:43:27 +0000 (13:43 +0000)]

Merge "Integer.valueOf() -> Integer.parseInt() to avoid allocation." am: c027ae49f0 am: a2ad95a1e3
am: 7ea07312f5

* commit '7ea07312f5cec98cf39b676afbc7589f17e94e21':
Integer.valueOf() -> Integer.parseInt() to avoid allocation.

Change-Id: I778b7ad298b7bfed8ffdc9e0be37084ff3123015

commit | commitdiff | tree

Tobias Thierer [Thu, 21 Apr 2016 13:41:12 +0000 (13:41 +0000)]

Merge "Integer.valueOf() -> Integer.parseInt() to avoid allocation." am: c027ae49f0
am: a2ad95a1e3

* commit 'a2ad95a1e3933190004d9fb414ea2d54540bf4f2':
Integer.valueOf() -> Integer.parseInt() to avoid allocation.

Change-Id: I72b7a6d5a36eb10ccf321e8ecb0f24ab6834324a

commit | commitdiff | tree

Tobias Thierer [Thu, 21 Apr 2016 13:38:52 +0000 (13:38 +0000)]

Merge "Integer.valueOf() -> Integer.parseInt() to avoid allocation."
am: c027ae49f0

* commit 'c027ae49f0a941c73c692e1153b2a6623fdae152':
Integer.valueOf() -> Integer.parseInt() to avoid allocation.

Change-Id: I8cb16c650ea35299a99a878134c3060d4ae6ed1e

commit | commitdiff | tree

Clara Bayarri [Thu, 21 Apr 2016 13:28:47 +0000 (14:28 +0100)]

Reinflate QS view on Locale configuration change

The existing DensityContainer already did this for density changes,
repurposed it to handle other Configuration changes. Also renamed
to AutoReinflateContainer.

Bug: 27952059
Change-Id: Ieb572abcbafe49aec73b16e1bcb8c294011afdd3

commit | commitdiff | tree

Tobias Thierer [Thu, 21 Apr 2016 13:23:18 +0000 (13:23 +0000)]

Merge "Integer.valueOf() -> Integer.parseInt() to avoid allocation."

commit | commitdiff | tree

Tobias Thierer [Thu, 21 Apr 2016 11:02:10 +0000 (12:02 +0100)]

Integer.valueOf() -> Integer.parseInt() to avoid allocation.

Bug: 28289401
Change-Id: If767f891644a06ba587f9bb55dccea4089a8c66d

commit | commitdiff | tree

Clara Bayarri [Fri, 15 Apr 2016 12:09:39 +0000 (13:09 +0100)]

Fix silent errors when launching Keyboard Shortcuts from Settings

The following error was thrown, given that Activity is generating a
protected broadcast:
Sending non-protected broadcast
android.intent.action.SHOW_KEYBOARD_SHORTCUTS from system

Bug: 28138503
Change-Id: I50d5212d7776d33ffe6e9df1c5f080205ac4a29d

commit | commitdiff | tree

Jaewan Kim [Thu, 21 Apr 2016 07:22:48 +0000 (16:22 +0900)]

PIP: Fix system UI crash

Bug: 28306480
Change-Id: Ie36f73c46f3ee8d6a2cb8264458cb0e0410aaecd

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 05:33:05 +0000 (05:33 +0000)]

Merge "Merge "Expand NetworkMonitor metrics" into nyc-dev am: b99d6af3ab am: 50f963f022" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Erik Kline [Thu, 21 Apr 2016 05:32:43 +0000 (05:32 +0000)]

Merge "Expand NetworkMonitor metrics" into nyc-dev am: b99d6af3ab
am: 50f963f022

* commit '50f963f022e2a847a6218f6ec182f9503854f551':

Change-Id: If0740e57da4d93f1a3b5be71aaa71a5edf52173b

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 05:31:12 +0000 (05:31 +0000)]

Merge "Merge "Expand NetworkMonitor metrics" into nyc-dev am: b99d6af3ab am: 50f963f022" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Erik Kline [Thu, 21 Apr 2016 05:30:43 +0000 (05:30 +0000)]

Merge "Expand NetworkMonitor metrics" into nyc-dev am: b99d6af3ab
am: 0f155c5778

* commit '0f155c5778ed54f3e8dbc579e2709bde1871a46c':
Expand NetworkMonitor metrics

Change-Id: I476c70c47b85b4ed672156749d371e9092fb869b

commit | commitdiff | tree

Erik Kline [Thu, 21 Apr 2016 05:30:41 +0000 (05:30 +0000)]

Merge "Expand NetworkMonitor metrics" into nyc-dev am: b99d6af3ab
am: 50f963f022

* commit '50f963f022e2a847a6218f6ec182f9503854f551':
Expand NetworkMonitor metrics

Change-Id: I1cd1240937d79c194c885caaf5304a0b761c293b

commit | commitdiff | tree

Erik Kline [Thu, 21 Apr 2016 05:28:30 +0000 (05:28 +0000)]

Merge "Expand NetworkMonitor metrics" into nyc-dev
am: b99d6af3ab

* commit 'b99d6af3ab406db14d161cdc0000ed521957d7ca':
Expand NetworkMonitor metrics

Change-Id: I1d5475b998b6e29ad8bf43f8e457d9f4db85527a

commit | commitdiff | tree

Erik Kline [Thu, 21 Apr 2016 05:28:28 +0000 (05:28 +0000)]

Merge "Expand NetworkMonitor metrics" into nyc-dev
am: b99d6af3ab

* commit 'b99d6af3ab406db14d161cdc0000ed521957d7ca':
Expand NetworkMonitor metrics

Change-Id: I6fad2c6fa68c42d161f90abedf83624379b48c8d

commit | commitdiff | tree

TreeHugger Robot [Thu, 21 Apr 2016 05:24:38 +0000 (05:24 +0000)]

Merge "Expand NetworkMonitor metrics" into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 04:17:35 +0000 (04:17 +0000)]

Merge "Merge "Some fixes in ConnectivityService event logging" into nyc-dev am: 7261fb27de am: 9fc5843fa8" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Hugo Benichi [Thu, 21 Apr 2016 04:17:08 +0000 (04:17 +0000)]

Merge "Some fixes in ConnectivityService event logging" into nyc-dev am: 7261fb27de
am: 9fc5843fa8

* commit '9fc5843fa837c53e9d95733fe74c429e49beb460':

Change-Id: I7d2861350744e3bdefe6f4315d9a6de79d136e1c