Lorenzo Colitti
be9194115b
Merge "Honour the DHCP MTU option." into nyc-dev am: f512023
...
am: c3ab6ea
* commit 'c3ab6ea4e4bed08dc60d44c0203c4f657704b36d':
Honour the DHCP MTU option.
Change-Id: I3343cfa204c54a1060eeaba9d1496bb7dc811c3a
2016-04-01 01:02:36 +00:00
Lorenzo Colitti
c3ab6ea4e4
Merge "Honour the DHCP MTU option." into nyc-dev
...
am: f512023
* commit 'f5120236c41c47adeddf71a5f0967b12119df2cf':
Honour the DHCP MTU option.
Change-Id: I49b425431441caab06576a2ca731b9f2ac538554
2016-04-01 00:58:53 +00:00
Lorenzo Colitti
f5120236c4
Merge "Honour the DHCP MTU option." into nyc-dev
2016-04-01 00:55:08 +00:00
Wei Wang
9dacbf71fc
Merge "Add death monitor to AsyncChannel Server." into nyc-dev am: 3054d01
...
am: 613eac8
* commit '613eac8d76e6bf185ce0a381522b74d1d13e27c4':
Add death monitor to AsyncChannel Server.
Change-Id: I8a73ae84aad856e85147e381a89d7609ef426a27
2016-03-31 23:26:58 +00:00
Wei Wang
613eac8d76
Merge "Add death monitor to AsyncChannel Server." into nyc-dev
...
am: 3054d01
* commit '3054d010327f8888919d7e0a97d63773dd015681':
Add death monitor to AsyncChannel Server.
Change-Id: I949160fa577caf42c02fbd07270e20c56cc2803a
2016-03-31 23:22:47 +00:00
Wei Wang
3054d01032
Merge "Add death monitor to AsyncChannel Server." into nyc-dev
2016-03-31 23:13:35 +00:00
Wei Wang
19c4883c85
Add death monitor to AsyncChannel Server.
...
Bug:27878941
Change-Id: Ia6d12b49979b47434db7969372d6c02f799bc7d4
2016-03-31 15:49:36 -07:00
Christopher Tate
8f1ebb5de3
Merge "Handle interaction of Bundle.hasFileDescriptors() with removal" into nyc-dev am: 1486557
...
am: d4306fd
* commit 'd4306fd59029a650c741bcb9a305e83e09f2a8e4':
Handle interaction of Bundle.hasFileDescriptors() with removal
Change-Id: I6a0431d4231c3aad55161fa46ccb3fb420dff3ae
2016-03-31 22:31:59 +00:00
Christopher Tate
d4306fd590
Merge "Handle interaction of Bundle.hasFileDescriptors() with removal" into nyc-dev
...
am: 1486557
* commit '1486557d10f9969ef31b65e4312bd00b1a6f02ae':
Handle interaction of Bundle.hasFileDescriptors() with removal
Change-Id: I3e1d35c5fbd6ad2356abe61309f8b6797f3fbbba
2016-03-31 22:28:32 +00:00
Chris Tate
1486557d10
Merge "Handle interaction of Bundle.hasFileDescriptors() with removal" into nyc-dev
2016-03-31 22:22:32 +00:00
Ruben Brunk
8bdd359c7e
Merge "Grant default permissions to preinstalled VrListenerServices." into nyc-dev am: 8f7e381
...
am: ec64b9d
* commit 'ec64b9d8075239a51eac9993bc9eea61c4bddcaa':
Grant default permissions to preinstalled VrListenerServices.
Change-Id: I136e1c5bf3819ce7e25c5b4c988b955188ce665f
2016-03-31 22:06:08 +00:00
Ruben Brunk
ec64b9d807
Merge "Grant default permissions to preinstalled VrListenerServices." into nyc-dev
...
am: 8f7e381
* commit '8f7e3815e71cfb9a45b8632e6b9f37684699ff82':
Grant default permissions to preinstalled VrListenerServices.
Change-Id: I5332d425146fcac44b662843fa9b10644a6f8e1e
2016-03-31 22:02:55 +00:00
Ruben Brunk
8f7e3815e7
Merge "Grant default permissions to preinstalled VrListenerServices." into nyc-dev
2016-03-31 21:57:04 +00:00
Alan Viverette
b35b1d01b8
Merge "Improve handling of AlertDialog padding between title and content" into nyc-dev am: f0f919f
...
am: e413d20
* commit 'e413d20fa951fc18eff74d65656b2e83ec81c98a':
Improve handling of AlertDialog padding between title and content
Change-Id: Id0d59f9ee5b4c924046f1c934ff05044c51364e4
2016-03-31 21:14:47 +00:00
Alan Viverette
e413d20fa9
Merge "Improve handling of AlertDialog padding between title and content" into nyc-dev
...
am: f0f919f
* commit 'f0f919f19a6b442648048837c2ff3517f89853da':
Improve handling of AlertDialog padding between title and content
Change-Id: Ia506c800dbdbdd3214f80a9f75fb78bfbc4c4847
2016-03-31 21:11:33 +00:00
Alan Viverette
f0f919f19a
Merge "Improve handling of AlertDialog padding between title and content" into nyc-dev
2016-03-31 21:03:20 +00:00
Dianne Hackborn
645d355e92
Merge "(Docs only) Make battery stats process state docs more clear."
2016-03-31 20:58:17 +00:00
Christopher Tate
250985f556
Handle interaction of Bundle.hasFileDescriptors() with removal
...
Removing entries from a Bundle may change its has-FDs state, so now
induce a recheck after removals. In support of that, make the
recheck set the known state in all cases, not just in the has-FDs
case; and note that filterValues() inherently produces a result that
is known to have no FDs.
Bug 26676151
Change-Id: Ida07b77ad2046aeafb98e0b164cd571ce45d064f
2016-03-31 13:57:42 -07:00
Dianne Hackborn
475ab1b1b5
(Docs only) Make battery stats process state docs more clear.
...
Change-Id: Ib6284cb6325d4e4991a3f66f0e46508b1f94078e
2016-03-31 13:57:19 -07:00
Alex Klyubin
e89434b7c4
Merge "Remove support for DSA with SHA-512 from v2 sig verification." into nyc-dev am: 3a21805
...
am: ae10eb8
* commit 'ae10eb8f88d35d89a14a044284c012c0d648d339':
Remove support for DSA with SHA-512 from v2 sig verification.
Change-Id: I1c238d6952048357758456d3f67d00eab1076ae3
2016-03-31 20:55:21 +00:00
Alex Klyubin
ae10eb8f88
Merge "Remove support for DSA with SHA-512 from v2 sig verification." into nyc-dev
...
am: 3a21805
* commit '3a21805aa19d34b1aede3c14eab2292b0f91ee89':
Remove support for DSA with SHA-512 from v2 sig verification.
Change-Id: I37a7c268fbfc8d60ebded9c3ea6e0098c0c9610f
2016-03-31 20:52:12 +00:00
Alex Klyubin
3a21805aa1
Merge "Remove support for DSA with SHA-512 from v2 sig verification." into nyc-dev
2016-03-31 20:46:04 +00:00
George Mount
1c220b5ade
Merge "Revert "Revert "Run cleanup before end actions of ViewPropertyAnimator.""" into nyc-dev am: 98aa25c
...
am: dc21c57
* commit 'dc21c57aa01d9adad60f15553423335b063c0ab4':
Revert "Revert "Run cleanup before end actions of ViewPropertyAnimator.""
Change-Id: I14b1f45a7adcde076bef8369ceaf72c04110f5be
2016-03-31 20:23:47 +00:00
George Mount
dc21c57aa0
Merge "Revert "Revert "Run cleanup before end actions of ViewPropertyAnimator.""" into nyc-dev
...
am: 98aa25c
* commit '98aa25c2d9c1ac2ebacef7612f5103925ff84d94':
Revert "Revert "Run cleanup before end actions of ViewPropertyAnimator.""
Change-Id: I449067238317b66090e036a40181c27ec892a01d
2016-03-31 20:20:45 +00:00
George Mount
98aa25c2d9
Merge "Revert "Revert "Run cleanup before end actions of ViewPropertyAnimator.""" into nyc-dev
2016-03-31 20:14:04 +00:00
Roozbeh Pournader
9075152a8a
Merge "Invalidate TextView after locale change" into nyc-dev am: 1a08865
...
am: 2c915b9
* commit '2c915b99c6fe00ffbf2e33d4485bdb2a5fb89c14':
Invalidate TextView after locale change
Change-Id: Icf0c8a0b72973a24c54a67b96df6382d89bd1fb4
2016-03-31 19:46:15 +00:00
Roozbeh Pournader
2c915b99c6
Merge "Invalidate TextView after locale change" into nyc-dev
...
am: 1a08865
* commit '1a08865d1fed6634746e7ca19cdd30e028681fb1':
Invalidate TextView after locale change
Change-Id: Ic3c82bd2fc0553354e1ea8fc9cfcda7a3d565fc0
2016-03-31 19:43:08 +00:00
Roozbeh Pournader
1a08865d1f
Merge "Invalidate TextView after locale change" into nyc-dev
2016-03-31 19:37:55 +00:00
Christopher Tate
6c68a45108
Merge "API review: WallpaperManager" into nyc-dev am: 9c4ec06
...
am: e6dc55c
* commit 'e6dc55c327cb99e8dede71a25fedd81ac694bd6c':
API review: WallpaperManager
Change-Id: I7817ac377a000eca4444101ec86b22e65b89148a
2016-03-31 19:37:11 +00:00
Christopher Tate
e6dc55c327
Merge "API review: WallpaperManager" into nyc-dev
...
am: 9c4ec06
* commit '9c4ec06988642e24f9cf9a0dd79d777526b0a0a6':
API review: WallpaperManager
Change-Id: If59d4cb7bc609fee139e0874dd70efc451367522
2016-03-31 19:33:49 +00:00
Chris Tate
9c4ec06988
Merge "API review: WallpaperManager" into nyc-dev
2016-03-31 19:24:42 +00:00
Alex Klyubin
dfb5772447
Remove support for DSA with SHA-512 from v2 sig verification.
...
Android platform does not support DSA with SHA-512. Thus, it does not
make sense to support this unsupported algorithm in APK Signature
Scheme v2.
Bug: 24331392
Change-Id: Ie90b3dd8dd67bad65c64dfb7f6bf427e8ed282ba
2016-03-31 12:06:18 -07:00
Nathan Harold
5e2f746253
Merge "Add Settings.Global.WIFI_VERBOSE_LOGGING_ENABLED" into nyc-dev am: 3dafea3
...
am: b2402f6
* commit 'b2402f6ed5b66148724119471c62f1d406e71209':
Add Settings.Global.WIFI_VERBOSE_LOGGING_ENABLED
Change-Id: I33b458a6b1ad193ad42c4a21fed6b7634f11e04e
2016-03-31 18:49:46 +00:00
Vladislav Kaznacheev
258fbcb0b8
Merge "Add wallpaper input consumer to WindowManagerService" into nyc-dev am: b7d08c3
...
am: 72e7feb
* commit '72e7feb221c58536a4a4e5116fa7bc4f5ffee8b0':
Add wallpaper input consumer to WindowManagerService
Change-Id: I89a9bbf331bbd02bc53a3b47b4157d9e4904964c
2016-03-31 18:49:44 +00:00
Nathan Harold
b2402f6ed5
Merge "Add Settings.Global.WIFI_VERBOSE_LOGGING_ENABLED" into nyc-dev
...
am: 3dafea3
* commit '3dafea3177e0f962347000d58646ccebedfed203':
Add Settings.Global.WIFI_VERBOSE_LOGGING_ENABLED
Change-Id: I64235eae353ef90f7e3206a649fc3c4978f002b3
2016-03-31 18:46:37 +00:00
Vladislav Kaznacheev
72e7feb221
Merge "Add wallpaper input consumer to WindowManagerService" into nyc-dev
...
am: b7d08c3
* commit 'b7d08c3f3cee0e1575739250c12923930a9a5dbe':
Add wallpaper input consumer to WindowManagerService
Change-Id: I0a80ffe5fcd4f12dbe295b81b4f357b9b119319c
2016-03-31 18:46:34 +00:00
Nathan Harold
3dafea3177
Merge "Add Settings.Global.WIFI_VERBOSE_LOGGING_ENABLED" into nyc-dev
2016-03-31 18:43:36 +00:00
Vladislav Kaznacheev
b7d08c3f3c
Merge "Add wallpaper input consumer to WindowManagerService" into nyc-dev
2016-03-31 18:43:16 +00:00
Vladislav Kaznacheev
0d50d8660d
Add wallpaper input consumer to WindowManagerService
...
This is an input consumer similar to the one used when hiding the navbar,
but placed above wallpapers. It might be useful for processing touch
events over "desktop" in freeform MW mode.
Re-landing I9d6d28a624f750ad48fc39f9b149dd1f989cceba after fixing build.
Bug:26688904
Change-Id: I89fdabd9c72cdd4a1d7ca626c33ddc99ddea97f9
2016-03-31 18:42:22 +00:00
Robin Lee
68d91c0a81
Merge "API to approve CA certificates" into nyc-dev am: f1fe782
...
am: 8d0373c
* commit '8d0373c8fdeabbe90df4d78652cf03c8f9d0fd9f':
API to approve CA certificates
Change-Id: I86bf99827083c57bde7b14704e942d19ecc94b87
2016-03-31 18:34:38 +00:00
John Reck
8fdf729fb7
Merge "Add a callback for rendernode parentcount=0" into nyc-dev am: bbb4c2e
...
am: 3c77e5a
* commit '3c77e5aa9d219193ba8a8e5f33ad23e63f55d4f5':
Add a callback for rendernode parentcount=0
Change-Id: Ia49e05a9235d16249553b8638f9a2dad894f2198
2016-03-31 18:34:35 +00:00
Robin Lee
8d0373c8fd
Merge "API to approve CA certificates" into nyc-dev
...
am: f1fe782
* commit 'f1fe782e912d3feed9cded8fb80b179c4ee5d09c':
API to approve CA certificates
Change-Id: Ia84876f692a79d159cbfadd5888d73557e111e37
2016-03-31 18:31:32 +00:00
John Reck
3c77e5aa9d
Merge "Add a callback for rendernode parentcount=0" into nyc-dev
...
am: bbb4c2e
* commit 'bbb4c2eb2e871977289a9c48f414962e46b56ddc':
Add a callback for rendernode parentcount=0
Change-Id: I8168b028ce61413da8ecea76e6531c5dde9ddb46
2016-03-31 18:31:30 +00:00
Robin Lee
f1fe782e91
Merge "API to approve CA certificates" into nyc-dev
2016-03-31 18:26:32 +00:00
John Reck
bbb4c2eb2e
Merge "Add a callback for rendernode parentcount=0" into nyc-dev
2016-03-31 18:24:49 +00:00
Roozbeh Pournader
fafb7575c7
Invalidate TextView after locale change
...
Bug: 19294390
Change-Id: Ie0f08ab84b386ef6daa2570ea4d5203a04763b06
2016-03-31 11:23:00 -07:00
George Mount
f643fb0250
Revert "Revert "Run cleanup before end actions of ViewPropertyAnimator.""
...
This reverts commit 879a626f18 .
Change-Id: I6fd011fb86a2aa0e30ba41fdefa3e29c7771e647
2016-03-31 11:15:27 -07:00
Ruben Brunk
b839b91fde
Merge "Include VR throttling limit in hardware properties." into nyc-dev am: ee1062e
...
am: f5d1bc3
* commit 'f5d1bc31fe66881bbf81c54e0a8d24699bfc54ea':
Include VR throttling limit in hardware properties.
Change-Id: I7861d381c5fec4eab38d78ec24eb80e44bb21e55
2016-03-31 18:14:18 +00:00
Ruben Brunk
f5d1bc31fe
Merge "Include VR throttling limit in hardware properties." into nyc-dev
...
am: ee1062e
* commit 'ee1062e4c011578906edf08d340eff5a55ebe085':
Include VR throttling limit in hardware properties.
Change-Id: I5d404f5fe7ad36dfe5269f7acb148146b7c2eabf
2016-03-31 18:11:08 +00:00
Ruben Brunk
ee1062e4c0
Merge "Include VR throttling limit in hardware properties." into nyc-dev
2016-03-31 18:03:37 +00:00