OSDN Git Service
Chong Zhang [Fri, 15 Jul 2016 18:37:59 +0000 (18:37 +0000)]
Merge \"Don\'t release surface if relayout is visible\" into nyc-mr1-dev
am:
465376c5ae
Change-Id: I47d834d26cee248900d268bbe027ea82fd7c286a
Adrian Roos [Fri, 15 Jul 2016 18:31:20 +0000 (18:31 +0000)]
Merge \"Add ApplicationErrorReport tests\" into nyc-mr1-dev
am:
f86d855125
Change-Id: I57d00e200ebf03010fca4ae0753200b981faaad4
Chong Zhang [Fri, 15 Jul 2016 18:26:27 +0000 (18:26 +0000)]
Merge "Don't release surface if relayout is visible" into nyc-mr1-dev
Adrian Roos [Fri, 15 Jul 2016 18:24:27 +0000 (18:24 +0000)]
Merge "Add ApplicationErrorReport tests" into nyc-mr1-dev
Ruben Brunk [Fri, 15 Jul 2016 18:15:42 +0000 (18:15 +0000)]
Merge \"Remove VR package disable logic.\" into nyc-mr1-dev
am:
b005e0685f
Change-Id: I0ee90e535d49ee04e6e26048e6e72e15b44fad17
Ruben Brunk [Fri, 15 Jul 2016 18:09:34 +0000 (18:09 +0000)]
Merge "Remove VR package disable logic." into nyc-mr1-dev
Christopher Tate [Fri, 15 Jul 2016 18:08:57 +0000 (18:08 +0000)]
Merge \"Turn down restore-time logspam\" into nyc-mr1-dev
am:
a46b7f44c0
Change-Id: Ied38c22902590f12044aa010b0573e4bc3dbc11e
Chris Tate [Fri, 15 Jul 2016 18:05:06 +0000 (18:05 +0000)]
Merge "Turn down restore-time logspam" into nyc-mr1-dev
Christopher Tate [Fri, 15 Jul 2016 17:53:15 +0000 (10:53 -0700)]
Turn down restore-time logspam
Bug
30160827
Change-Id: I14ccf0a31e5a6882bf189c28c79d1c139ec44bcc
Android Build Merger (Role) [Fri, 15 Jul 2016 17:26:17 +0000 (17:26 +0000)]
Merge "Docs: Behavior changes such as activity dismissal am:
f506485b51 am:
274d904d4c am:
8432d4328d am:
5c7a3e4867" into nyc-mr1-dev-plus-aosp
Bert McMeen [Fri, 15 Jul 2016 17:25:53 +0000 (17:25 +0000)]
Docs: Behavior changes such as activity dismissal am:
f506485b51 am:
274d904d4c am:
8432d4328d
am:
5c7a3e4867
Change-Id: Ic2330a5ebfff87285b2f68a02c2450d2e2f9355b
Bert McMeen [Fri, 15 Jul 2016 17:25:39 +0000 (17:25 +0000)]
Docs: Behavior changes such as activity dismissal am:
f506485b51 am:
274d904d4c am:
8432d4328d
am:
e6430efbcf
Change-Id: I7c7e23d1a79bf7fa252dc59b8317be932fbd9e5d
Bert McMeen [Fri, 15 Jul 2016 17:19:44 +0000 (17:19 +0000)]
Docs: Behavior changes such as activity dismissal am:
f506485b51 am:
274d904d4c
am:
8432d4328d
Change-Id: I8eff2a07e0cfc07a407607a4e064b3c130f2ab48
Bert McMeen [Fri, 15 Jul 2016 17:19:42 +0000 (17:19 +0000)]
Docs: Behavior changes such as activity dismissal am:
f506485b51 am:
274d904d4c
am:
8432d4328d
Change-Id: I65edec2172b347df56a4be699060bd456cfe3923
Bert McMeen [Fri, 15 Jul 2016 17:14:06 +0000 (17:14 +0000)]
Docs: Behavior changes such as activity dismissal am:
f506485b51
am:
274d904d4c
Change-Id: I2bf5f981b7b8b001ce3d25ff0179270e23d08588
Bert McMeen [Fri, 15 Jul 2016 17:08:31 +0000 (17:08 +0000)]
Docs: Behavior changes such as activity dismissal
am:
f506485b51
Change-Id: Ia133aef14f006a15304ca744d933eb8934c80bb5
Jason Monk [Fri, 15 Jul 2016 17:03:46 +0000 (17:03 +0000)]
Merge \"QS: Don\'t use ComponentName to identify tiles\" into nyc-mr1-dev
am:
a0967ebbdf
Change-Id: Ib98a48e46f711b927a1b9e8d2b8162a59bfa3240
Jason Monk [Fri, 15 Jul 2016 16:55:22 +0000 (16:55 +0000)]
Merge "QS: Don't use ComponentName to identify tiles" into nyc-mr1-dev
Tony Mak [Fri, 15 Jul 2016 16:20:45 +0000 (16:20 +0000)]
Merge \"Disallow user to block notification from OobConfig\" into nyc-mr1-dev
am:
28763c5a77
Change-Id: Ie03835fd81e997e9feafe83ba50e6e4d9f10c820
Esteban Talavera [Fri, 15 Jul 2016 16:14:20 +0000 (16:14 +0000)]
Merge "Disallow user to block notification from OobConfig" into nyc-mr1-dev
Jason Monk [Fri, 15 Jul 2016 16:12:00 +0000 (16:12 +0000)]
Merge \"QS Detail: Don\'t animate switch before panel open\" into nyc-mr1-dev
am:
9716690e2f
Change-Id: If807c7c7e08103c882af67b5539cfbc8fd96505e
TreeHugger Robot [Fri, 15 Jul 2016 16:04:17 +0000 (16:04 +0000)]
Merge "QS Detail: Don't animate switch before panel open" into nyc-mr1-dev
Tyler Gunn [Fri, 15 Jul 2016 15:18:07 +0000 (15:18 +0000)]
Merge \"Add alternative EXTRA_CALL_RAT_TYPE definition for noncompliant modems.\" into nyc-mr1-dev
am:
9e73d82336
Change-Id: Idd57c35f04193ab1157e455f4c4242e30c9ea7a2
Pankaj Kanwar [Fri, 15 Jul 2016 15:10:26 +0000 (15:10 +0000)]
Merge "Add alternative EXTRA_CALL_RAT_TYPE definition for noncompliant modems." into nyc-mr1-dev
Android Build Merger (Role) [Fri, 15 Jul 2016 14:41:34 +0000 (14:41 +0000)]
Merge "Merge \\\\\\"Check caller\\\\\\'s uid before allowing notification policy access.\\\\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c am:
5c6db3af89 am:
e1d8b98189 -s ours am:
8e6b7c2f72 am:
837696131e" into nyc-mr1-dev-plus-aosp
Julia Reynolds [Fri, 15 Jul 2016 14:41:06 +0000 (14:41 +0000)]
Merge \\\\\\"Check caller\\\\\\'s uid before allowing notification policy access.\\\\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c am:
5c6db3af89 am:
e1d8b98189 -s ours am:
8e6b7c2f72
am:
837696131e
Change-Id: I76348913cc4d0905edb3badc45883bb4d14645ee
Julia Reynolds [Fri, 15 Jul 2016 14:41:05 +0000 (14:41 +0000)]
Merge \\\\\\"Check caller\\\\\\'s uid before allowing notification policy access.\\\\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c am:
5c6db3af89 am:
e1d8b98189 -s ours am:
8e6b7c2f72
am:
d59fc3a5c9
Change-Id: I1fa80e1f61ac3e2a8d929261d56334f715a6a377
Jason Monk [Fri, 15 Jul 2016 14:37:07 +0000 (10:37 -0400)]
QS Detail: Don't animate switch before panel open
This will make it more obvious that wifi gets turned on by opening
the panel as the animation of the state change will be visible.
Change-Id: I6ceb0bef914a9ff368b1bdb750d19aeb43593e78
Fixes:
29057528
Julia Reynolds [Fri, 15 Jul 2016 14:34:21 +0000 (14:34 +0000)]
Merge \\\\\"Check caller\\\\\'s uid before allowing notification policy access.\\\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c am:
5c6db3af89 am:
e1d8b98189 -s ours
am:
8e6b7c2f72
Change-Id: I0d01f75f3ba19142675de8c589071af9888deeab
Julia Reynolds [Fri, 15 Jul 2016 14:34:14 +0000 (14:34 +0000)]
Merge \\\\\"Check caller\\\\\'s uid before allowing notification policy access.\\\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c am:
5c6db3af89 am:
e1d8b98189 -s ours
am:
8e6b7c2f72
Change-Id: I10e3412be1a534f5511f72da63ea7581cab21140
Julia Reynolds [Fri, 15 Jul 2016 14:27:24 +0000 (14:27 +0000)]
Merge \\\\"Check caller\\\\'s uid before allowing notification policy access.\\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c am:
5c6db3af89
am:
e1d8b98189 -s ours
Change-Id: I583fa066aaf12cacb841b10f751ad0ad7a1de237
Julia Reynolds [Fri, 15 Jul 2016 14:17:56 +0000 (14:17 +0000)]
Merge \\\"Check caller\\\'s uid before allowing notification policy access.\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c
am:
5c6db3af89
Change-Id: Ie212c6105f8796f0e7c4ccf25ea132b8c9f99519
Julia Reynolds [Fri, 15 Jul 2016 14:12:23 +0000 (14:12 +0000)]
Merge \\"Check caller\\'s uid before allowing notification policy access.\\" into mnc-dev am:
234e1c25e4
am:
8e8bb6633c
Change-Id: Ic36dbb69f0eeddd85b17579b2fc90f75349e4ca3
Julia Reynolds [Fri, 15 Jul 2016 14:06:49 +0000 (14:06 +0000)]
Merge \"Check caller\'s uid before allowing notification policy access.\" into mnc-dev
am:
234e1c25e4
Change-Id: I6724832d28362a76cd2f65432d6e805738f335fa
Julia Reynolds [Fri, 15 Jul 2016 13:59:04 +0000 (13:59 +0000)]
Merge "Check caller's uid before allowing notification policy access." into mnc-dev
Ricky Wai [Fri, 15 Jul 2016 10:18:36 +0000 (10:18 +0000)]
Merge \"Remove tied profile encryption key cache in keystore\" into nyc-mr1-dev
am:
3ed2a52bb1
Change-Id: I127bb8329b374e57147b42f13f699b3125872367
Ricky Wai [Fri, 15 Jul 2016 10:09:39 +0000 (10:09 +0000)]
Merge "Remove tied profile encryption key cache in keystore" into nyc-mr1-dev
Tony Mak [Fri, 15 Jul 2016 07:25:01 +0000 (07:25 +0000)]
Merge \"Whitelisting device provisioning package from app standby\" into nyc-mr1-dev
am:
0c5b73ffc2
Change-Id: Id61bd55703b1cbf6410a6b668c26170ab3621efa
Tony Mak [Fri, 15 Jul 2016 07:17:42 +0000 (07:17 +0000)]
Merge "Whitelisting device provisioning package from app standby" into nyc-mr1-dev
Alan Leung [Fri, 15 Jul 2016 06:06:58 +0000 (06:06 +0000)]
Merge \"Fix thread priority after boosting.\" into nyc-mr1-dev
am:
1e9b8138f0
Change-Id: I613e3a0b1597ce59913663264f81673448426622
Alan Leung [Fri, 15 Jul 2016 06:00:06 +0000 (06:00 +0000)]
Merge "Fix thread priority after boosting." into nyc-mr1-dev
Lajos Molnar [Fri, 15 Jul 2016 05:53:37 +0000 (05:53 +0000)]
Merge \"media: document new temporal layering schema values.\" into nyc-mr1-dev
am:
12f860f5a2
Change-Id: Ifb3c99ca6e4b2a9dcec6d58afacbcba474ea4d73
Lajos Molnar [Fri, 15 Jul 2016 05:53:28 +0000 (05:53 +0000)]
Merge \"media: clarify MediaFormat.KEY_I_FRAME_INTERVAL\" into nyc-mr1-dev
am:
991c240a88
Change-Id: Id1e1bfdb65b10f5e7b99a0e164afc05ca2518dbf
Lajos Molnar [Fri, 15 Jul 2016 05:44:03 +0000 (05:44 +0000)]
Merge "media: document new temporal layering schema values." into nyc-mr1-dev
Lajos Molnar [Fri, 15 Jul 2016 05:43:39 +0000 (05:43 +0000)]
Merge "media: clarify MediaFormat.KEY_I_FRAME_INTERVAL" into nyc-mr1-dev
Lajos Molnar [Fri, 15 Jul 2016 02:54:50 +0000 (19:54 -0700)]
media: clarify MediaFormat.KEY_I_FRAME_INTERVAL
Bug:
30096321
Change-Id: I908b669caf5443fb272a2d274b7cbf7227913b3e
Hugo Benichi [Fri, 15 Jul 2016 04:06:17 +0000 (04:06 +0000)]
Merge \"APF: filter unwanted ARP replies\" into nyc-mr1-dev
am:
b91c1232ee
Change-Id: I8b1ea85b57b3075b1ebce7b3332aca656e5391af
TreeHugger Robot [Fri, 15 Jul 2016 03:59:48 +0000 (03:59 +0000)]
Merge "APF: filter unwanted ARP replies" into nyc-mr1-dev
Tony Mak [Thu, 14 Jul 2016 07:30:18 +0000 (15:30 +0800)]
Whitelisting device provisioning package from app standby
Change-Id: Ib9cb7a3fdf7aa16a97f22eacbed872880b7f9fbe
Fix:
29892977
Lajos Molnar [Fri, 15 Jul 2016 02:10:27 +0000 (19:10 -0700)]
media: document new temporal layering schema values.
Also fix doc as these are advertised on the output port.
Bug:
30150921
Bug:
27596987
Change-Id: Ia95876ade36bc82eea0e9795dea0268abbd1c1ef
Christopher Tate [Fri, 15 Jul 2016 01:49:31 +0000 (01:49 +0000)]
Merge \"Thread-safe pipe teardown during restore operations\" into nyc-mr1-dev
am:
4595bc7f12
Change-Id: I8c53961f93633f26615970c40d071f2e8d714780
Christopher Tate [Fri, 15 Jul 2016 01:49:26 +0000 (01:49 +0000)]
Merge \"Dump the source uid of scheduled jobs\" into nyc-mr1-dev
am:
b30e1f75d1
Change-Id: I50d5d91c0fd2713d1fdfe027bcf11865b6863452
Christopher Tate [Fri, 15 Jul 2016 01:49:19 +0000 (01:49 +0000)]
Merge \"Test existence of wallpaper files before backing them up\" into nyc-mr1-dev
am:
8b08553e90
Change-Id: Ic5acc8c87cef80795c3e286f9e24604af35ff6f5
Selim Cinek [Fri, 15 Jul 2016 01:49:11 +0000 (01:49 +0000)]
Merge \"Fixed a bug where the burmese clock could overlap\" into nyc-mr1-dev
am:
f25486f8a5
Change-Id: I5184fb95e70251291e5426c07e882e346a7e51f4
Chris Tate [Fri, 15 Jul 2016 01:38:02 +0000 (01:38 +0000)]
Merge "Thread-safe pipe teardown during restore operations" into nyc-mr1-dev
Chris Tate [Fri, 15 Jul 2016 01:37:19 +0000 (01:37 +0000)]
Merge "Dump the source uid of scheduled jobs" into nyc-mr1-dev
Chris Tate [Fri, 15 Jul 2016 01:36:46 +0000 (01:36 +0000)]
Merge "Test existence of wallpaper files before backing them up" into nyc-mr1-dev
TreeHugger Robot [Fri, 15 Jul 2016 01:33:32 +0000 (01:33 +0000)]
Merge "Fixed a bug where the burmese clock could overlap" into nyc-mr1-dev
Makoto Onuki [Fri, 15 Jul 2016 00:49:28 +0000 (00:49 +0000)]
Merge \"Handle locale change and pacakge change in different way\" into nyc-mr1-dev
am:
83fa7a8255
Change-Id: I4988ff6c77f70211336e21729f0f6cd69beefc7d
Makoto Onuki [Fri, 15 Jul 2016 00:39:04 +0000 (00:39 +0000)]
Merge "Handle locale change and pacakge change in different way" into nyc-mr1-dev
Lajos Molnar [Fri, 15 Jul 2016 00:35:12 +0000 (00:35 +0000)]
Merge \"media: clarify notes in MediaCodec doc\" into nyc-mr1-dev
am:
82d886434d
Change-Id: Iacc43f3db9a41a0373227fc09f3590cf275ec34f
Chong Zhang [Thu, 14 Jul 2016 22:09:12 +0000 (15:09 -0700)]
Don't release surface if relayout is visible
There is a delay from the point we notify the client to go invisible,
to the point that request is handled. If a relayout VISIBLE happens
during this period, we need to give the client a surface so that any
pending draws will go through.
bug:
30066966
Change-Id: I0cd4e4be49f3d2d8f726963ed9e23bf0327e1d0f
Lajos Molnar [Fri, 15 Jul 2016 00:25:29 +0000 (00:25 +0000)]
Merge "media: clarify notes in MediaCodec doc" into nyc-mr1-dev
Selim Cinek [Fri, 15 Jul 2016 00:13:48 +0000 (00:13 +0000)]
Merge \"Fixed the heads up disspearing bug for real\" into nyc-mr1-dev
am:
70b06cc62f
Change-Id: I4f800199c871b862eefd1d813e8ed04f9485d7da
TreeHugger Robot [Fri, 15 Jul 2016 00:09:46 +0000 (00:09 +0000)]
Merge "Fixed the heads up disspearing bug for real" into nyc-mr1-dev
Justin Klaassen [Fri, 15 Jul 2016 00:08:54 +0000 (00:08 +0000)]
Merge \"Don\'t activate Night display until user setup is complete\" into nyc-mr1-dev
am:
6028472b8a
Change-Id: I2dbc30f9b7744df53e17276f438db0c65a24a341
Chris Craik [Fri, 15 Jul 2016 00:08:45 +0000 (00:08 +0000)]
Merge \"Fix rotated clip regions\" into nyc-mr1-dev
am:
06f13cba5f
Change-Id: I4afab3a863f1f873e9dd95ed671072874a6a4511
TreeHugger Robot [Fri, 15 Jul 2016 00:04:20 +0000 (00:04 +0000)]
Merge "Don't activate Night display until user setup is complete" into nyc-mr1-dev
Chris Craik [Fri, 15 Jul 2016 00:02:25 +0000 (00:02 +0000)]
Merge "Fix rotated clip regions" into nyc-mr1-dev
Jim Miller [Thu, 14 Jul 2016 23:50:31 +0000 (23:50 +0000)]
Merge \"Fix bug where swiping on the fp sensor when the screen is off causes blank screen\" into nyc-mr1-dev
am:
538b836e05
Change-Id: I8391201f96bc408103727938a9b9aefd22f47793
TreeHugger Robot [Thu, 14 Jul 2016 23:45:11 +0000 (23:45 +0000)]
Merge "Fix bug where swiping on the fp sensor when the screen is off causes blank screen" into nyc-mr1-dev
Selim Cinek [Thu, 14 Jul 2016 23:32:23 +0000 (16:32 -0700)]
Fixed a bug where the burmese clock could overlap
Change-Id: I9ccd2fd5fd89c973d937196aa16d459e46eca769
Fixes:
26015598
Christopher Wiley [Thu, 14 Jul 2016 23:34:04 +0000 (23:34 +0000)]
Merge \"Properly disable WiFi tethering\" into nyc-mr1-dev
am:
f3d9863d5e
Change-Id: I3f6d475d01033930250fb97eb07b737ea546835d
TreeHugger Robot [Thu, 14 Jul 2016 23:26:55 +0000 (23:26 +0000)]
Merge "Properly disable WiFi tethering" into nyc-mr1-dev
Bert McMeen [Thu, 14 Jul 2016 23:11:18 +0000 (16:11 -0700)]
Docs: Behavior changes such as activity dismissal
Bug:
29447512
Change-Id: I5360212eab317fab5198afd36780c2d3cfe4d255
Selim Cinek [Thu, 14 Jul 2016 22:54:32 +0000 (22:54 +0000)]
Merge \"Fixed a bug where the header was positioned wrong\" into nyc-mr1-dev
am:
b1008221f9
Change-Id: I896f6ecbcda32d58edd4ed01ad2cce760db617b6
Justin Klaassen [Tue, 12 Jul 2016 04:26:46 +0000 (21:26 -0700)]
Don't activate Night display until user setup is complete
Bug:
30042357
Change-Id: I575c5e44b4109816ae14cc139ff171f141e6088f
TreeHugger Robot [Thu, 14 Jul 2016 22:50:07 +0000 (22:50 +0000)]
Merge "Fixed a bug where the header was positioned wrong" into nyc-mr1-dev
Philip Cuadra [Thu, 14 Jul 2016 22:38:15 +0000 (22:38 +0000)]
Merge \"Call into ART to get the location of the odex/oat file to pin\" into nyc-mr1-dev
am:
8b072fbd48
Change-Id: I3e5d753597a81d2cd1938781dce4370c383725ea
Raph Levien [Thu, 14 Jul 2016 22:37:57 +0000 (22:37 +0000)]
Merge \"Don\'t count zero width space in hasGlyph layout\" into nyc-mr1-dev
am:
f9c8893d1b
Change-Id: Ib84918cf6e12392fc58500d47feeb38ab28b7d43
Seigo Nonaka [Thu, 14 Jul 2016 22:37:53 +0000 (22:37 +0000)]
Merge \"Treat U+2695, U+2640, U+2642 as emoji characters.\" into nyc-mr1-dev
am:
c0ab2e83ac
Change-Id: Iaa4d63c425f5d263d322d463c320312890588aaf
Seigo Nonaka [Thu, 14 Jul 2016 22:37:50 +0000 (22:37 +0000)]
Merge \"Delete gender-balanced emoji sequence by one backspace key event.\" into nyc-mr1-dev
am:
ef9e2a5f4b
Change-Id: If60a0502875163ec60eeac61a3195e217b34e9f5
Doug Felt [Thu, 14 Jul 2016 22:30:09 +0000 (22:30 +0000)]
Merge \"Patch out part of the emoji tests.\" into nyc-mr1-dev
am:
2f39bc777c
Change-Id: I90c3528cf6d85929114af94feb0ef2f36954ca9f
Philip Cuadra [Thu, 14 Jul 2016 22:26:20 +0000 (22:26 +0000)]
Merge "Call into ART to get the location of the odex/oat file to pin" into nyc-mr1-dev
Raph Levien [Thu, 14 Jul 2016 22:26:03 +0000 (22:26 +0000)]
Merge "Don't count zero width space in hasGlyph layout" into nyc-mr1-dev
Raph Levien [Thu, 14 Jul 2016 22:25:39 +0000 (22:25 +0000)]
Merge "Treat U+2695, U+2640, U+2642 as emoji characters." into nyc-mr1-dev
Raph Levien [Thu, 14 Jul 2016 22:25:20 +0000 (22:25 +0000)]
Merge "Delete gender-balanced emoji sequence by one backspace key event." into nyc-mr1-dev
Raph Levien [Thu, 14 Jul 2016 22:24:13 +0000 (22:24 +0000)]
Merge "Patch out part of the emoji tests." into nyc-mr1-dev
Android Build Merger (Role) [Thu, 14 Jul 2016 22:19:15 +0000 (22:19 +0000)]
Merge "Merge \\"Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set\\" into nyc-dev am:
488042fe3b am:
c4ef7669a1" into nyc-mr1-dev-plus-aosp
Victor Chang [Thu, 14 Jul 2016 22:18:51 +0000 (22:18 +0000)]
Merge \\"Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set\\" into nyc-dev am:
488042fe3b
am:
c4ef7669a1
Change-Id: I475fad882d4fb67e3af813b3a2a2548dae760c16
Victor Chang [Thu, 14 Jul 2016 22:18:28 +0000 (22:18 +0000)]
Merge \\"Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set\\" into nyc-dev am:
488042fe3b
am:
07e11c3ae9
Change-Id: If1ff799f4c515b84dbb8cb4fa6f06f747f78bf67
Victor Chang [Thu, 14 Jul 2016 22:10:06 +0000 (22:10 +0000)]
Merge \"Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set\" into nyc-dev
am:
488042fe3b
Change-Id: Ia41b8b2acbe3897423ac27881f3419efcfeeb002
Victor Chang [Thu, 14 Jul 2016 22:09:59 +0000 (22:09 +0000)]
Merge \"Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set\" into nyc-dev
am:
488042fe3b
Change-Id: I4d542c19e057b044544a2ed4f07b9c2cc5866f0f
Alan Leung [Wed, 13 Jul 2016 17:59:54 +0000 (10:59 -0700)]
Fix thread priority after boosting.
The previous CL wrongly restores all priority to nice 0.
This CL changes two things:
1. It remembers and restores the previous priority.
2. If the thread has priority of < -2. Do not set it to -2.
BUG:
29930920
Change-Id: I927e060d789c9bbf92f6a166f44317d9db0f5205
Victor Chang [Thu, 14 Jul 2016 22:04:10 +0000 (22:04 +0000)]
Merge "Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set" into nyc-dev
Chris Craik [Thu, 14 Jul 2016 21:24:16 +0000 (14:24 -0700)]
Fix rotated clip regions
bug:
26562461
fixes:
30109912
SeekBar clips out the area of the thumb when drawing its track. This
creates a clip region, since a rect has been subtracted.
This changes region transform support in computing final clip to
properly support any rect-to-rect transform (such as 90 degree rotation)
when applying a clip region.
Change-Id: Ib3bbc52637e59e00b3a7e7d5c4c40555e26c578b
Selim Cinek [Thu, 14 Jul 2016 18:16:58 +0000 (11:16 -0700)]
Fixed the heads up disspearing bug for real
When children become unisolated, they could be stuck in heads up mode.
Change-Id: I18227ae6743abec8fd6dc75916c67549f9e0aac4
Fixes:
30120962
Selim Cinek [Thu, 14 Jul 2016 01:50:04 +0000 (18:50 -0700)]
Fixed a bug where the header was positioned wrong
Also cleaned up some logic about the translation
Change-Id: I6bfcb36ac27d8d6280e8ffea62b597d3bc705121
Fixes:
29880654
Android Build Merger (Role) [Thu, 14 Jul 2016 20:51:57 +0000 (20:51 +0000)]
Merge "Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
9cdfb9d781 -s ours am:
60c459ff05 -s ours" into nyc-mr1-dev-plus-aosp
Bill Yi [Thu, 14 Jul 2016 20:51:21 +0000 (20:51 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
9cdfb9d781 -s ours
am:
87df5f6ded -s ours
Change-Id: I76787013cb8774e862b7501852604d2c666f68c9