Manu Cornet
d71ec6347a
2D recents: full screen view and semi-transparent dark background
...
This matches the newest mocks better than the previous version.
Bug: 32101881
Test: Locally on local Ryu device
Change-Id: I85769215a48b7a4f1e7b52bd7572eb48ca333471
2016-11-14 09:49:20 -08:00
Andreas Gampe
6b59a74330
resolve merge conflicts of 50c5f04 to master
...
Change-Id: I2b1154e636258ccce6c4482415752444d2ac1326
2016-11-14 09:42:42 -08:00
Jean-Michel Trivi
8e48c6939b
Refactor SoundPool for appOps handling through PlayerBase
...
Modified the signature of the abstract volume methods so
it is clear at the subclass level whether the volume
command is for a mute or a volume control.
Changed the implementations in the subclasses
accordingly.
Removed appOps handling inside SoundPool and made it
inherit from PlayerBase.
Moved handling of the camera sound restriction from
SoundPool to PlayerBase.
Added support in SoundPool native implementation for
muting, as each player has its own volume.
Test: play a long file with SoundPool and enter DnD mode
Bug: 30955183
Bug: 28249605
Change-Id: I0fcd7480f9a455c06aa4f7092486f5c65bc9d7db
2016-11-14 09:36:11 -08:00
Romain Guy
5d7e2352e7
Add @HalfFloat annotation for fp16 data types stored in shorts
...
This CL has a companion CL to add the @HalfFloat annotation to the
support library.
Test: cts-tradefed run singleCommand cts-dev --module CtsUtilTestCases --test android.util.cts.HalfTest
Bug: 29940137
Change-Id: I4e1dc456687c1c026437150e9cc94a54f3264d4e
2016-11-14 09:27:26 -08:00
Narayan Kamath
50c5f04262
Zygote: Additional whitelists for runtime overlay / other static resources.
...
am: 9087f331a8
2016-11-14 17:25:09 +00:00
Narayan Kamath
d9a8ee7598
Zygote: Additional whitelists for runtime overlay / other static resources.
...
Partially cherry picked from commit 1c15c6357825cd01cc699087f331a8
2016-11-14 17:21:37 +00:00
Narayan Kamath
9087f331a8
Zygote: Additional whitelists for runtime overlay / other static resources.
...
Partially cherry picked from commit 1c15c6357825cd01cc69
2016-11-14 09:07:32 -08:00
TreeHugger Robot
2c2fb6189c
Merge "Allow cross profile call between DO and PO"
2016-11-14 16:27:56 +00:00
Tyler Gunn
8223dc1ae9
Merge "Add CAPABILITY_SUPPORTS_VIDEO_CALLING to PhoneAccount."
2016-11-14 16:23:43 +00:00
Michal Karpinski
445c692bce
Merge "[DPM] Minor code fixes in NetworkLoggingHandler"
2016-11-14 16:21:37 +00:00
Neil Fuller
c66ec40d38
Correctly handle when the user has no explicit time_12_24 setting
...
The code would previously interpret "null" (meaning the user
hasn't touched the setting in the Settings app) as meaning
"use 12 hour format". The actual meaning of "null" is
generally accepted in the platform as
"use the locale default". For example, the Settings app does
this, as does the code in libcore.icu.LocaleData. For
locales where the default is "use 12 hour format" anyway
this wasn't obvious. However, locales like Germany should
default to 24 hour, and then the setting is displayed
incorrectly in the Settings app.
Also, German devices boot for the first time with 12 hour SHORT
and MEDIUM time formats too. After the user had explicitly set
the format the setting would be correct.
There appear to be no tests for this behavior, presumably
because of the difficulty in forcing the setting to "unset"
which would have to have to happen before the app was launched,
and the fact that CTS tests run in the US locale.
Bug: 32868036
Test: Manual testing with a device set to German
Change-Id: Ifd2e8d345f6afee467d7525d6793fc8fda37c900
2016-11-14 16:06:42 +00:00
TreeHugger Robot
d43d705735
Merge "Revert "Add Build.isAtLeastO""
2016-11-14 15:46:17 +00:00
Steven Moreland
1662b38f4e
Merge "hidl: Update for IFoo::descriptor -> const char *." am: e17e68f139 am: 5f9ac42029 am: cd0f045eb7
...
am: d3a15478a7
2016-11-14 15:37:14 +00:00
Steven Moreland
d3a15478a7
Merge "hidl: Update for IFoo::descriptor -> const char *." am: e17e68f139 am: 5f9ac42029
...
am: cd0f045eb7
2016-11-14 15:29:39 +00:00
Steven Moreland
cd0f045eb7
Merge "hidl: Update for IFoo::descriptor -> const char *." am: e17e68f139
...
am: 5f9ac42029
2016-11-14 15:22:35 +00:00
Chris Wren
5e334f6b53
add event type enum to proto def
...
Test: ./vendor/google/tools/systemui/systemui_test_cookbook.sh
Change-Id: Idc8b5b942caa566f533b76f6d834291a71cf0da7
2016-11-14 10:16:21 -05:00
Steven Moreland
5f9ac42029
Merge "hidl: Update for IFoo::descriptor -> const char *."
...
am: e17e68f139
2016-11-14 15:15:39 +00:00
Treehugger Robot
e17e68f139
Merge "hidl: Update for IFoo::descriptor -> const char *."
2016-11-14 15:03:32 +00:00
Bartosz Fabianowski
863fb378ea
Merge "Add metrics constant for Enterprise Privacy Settings page"
2016-11-14 15:01:33 +00:00
Andriy Naborskyy
b7fae82de8
Merge "DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"" into cw-e-dev am: 11da2b5de3 -s ours am: 3f39609cff -s ours am: fb4beac069 -s ours am: 18305d920e -s ours am: 0a2ac837d1 -s ours am: 415ec85fdb -s ours am: 5c47b5ec06 -s ours
...
am: fd9358530a
2016-11-14 14:36:57 +00:00
Andriy Naborskyy
e38fb5c054
DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous" am: c5bf8bc74d -s ours am: f380f53752 -s ours am: dbbde14239 -s ours am: f566a1d4bf -s ours am: e26d15582b -s ours am: bb1dfdc660 -s ours am: 2480121100 -s ours
...
am: 9635303d5f
2016-11-14 14:35:51 +00:00
Brian Carlstrom
ff1c089fc8
Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev am: 5d0cabf78e am: 3be5dec18a am: b272d7cb13 am: f9150bf362 am: 58612638d1 am: d9ea80d009 am: 46abcdd83f am: 35063cdb3c
...
am: 081d505073
2016-11-14 14:34:39 +00:00
Narayan Kamath
eb40a86f26
Zygote : Block SIGCHLD during fork. am: b6f3751599 am: b23e864573 am: 52021073a4 am: 479385b6b3 am: 5f70cb0898 am: df3e599c7d am: 19ee3109e1 am: bf3c83eeac
...
am: 11959bd5fc
2016-11-14 14:27:29 +00:00
Narayan Kamath
46e3851a77
Zygote : Block SIGCHLD during fork. am: b1f1209d9a am: 35b8453338 am: 14bd75fa79 am: 50b0c3be57 -s ours am: e1e735bcb9 am: 072b70bae3 am: ba6d5ee377 am: f3f784853d am: 8ea47824fa am: 2f2611636b am: 86e1929551 am: 8ecbb2b2ae
...
am: 5db2340ba2
2016-11-14 14:26:12 +00:00
Narayan Kamath
5b2a615957
Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev am: 7bd25ab485 am: a045aed7a2 am: 846f64c6fc am: 83b46a1590 am: 330d0ebf48 am: 21c1e58090 am: 81fd9e618c am: 2c13554c18 am: fb207962aa am: 44e645e59a am: f2a94f71fb am: 48d16243f9
...
am: aa9b2b17fd
2016-11-14 14:24:48 +00:00
Andriy Naborskyy
fd9358530a
Merge "DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"" into cw-e-dev am: 11da2b5de3 -s ours am: 3f39609cff -s ours am: fb4beac069 -s ours am: 18305d920e -s ours am: 0a2ac837d1 -s ours am: 415ec85fdb -s ours
...
am: 5c47b5ec06
2016-11-14 14:24:29 +00:00
Narayan Kamath
f1ee7ebace
Zygote: Additional whitelisting for legacy devices. am: 7d302e018d am: f369b3ce75 am: e82866df3f am: f8335b6a59 am: 2f8ce5f5cb am: 5515b415aa am: d212aa9d13 am: 3b89a68a08 am: 146a0f86a6 am: 327edfeba2 am: 51930580bf am: deabe2c324
...
am: 0bcb75b5e8
2016-11-14 14:23:20 +00:00
Andriy Naborskyy
9635303d5f
DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous" am: c5bf8bc74d -s ours am: f380f53752 -s ours am: dbbde14239 -s ours am: f566a1d4bf -s ours am: e26d15582b -s ours am: bb1dfdc660 -s ours
...
am: 2480121100
2016-11-14 14:23:17 +00:00
Brian Carlstrom
081d505073
Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev am: 5d0cabf78e am: 3be5dec18a am: b272d7cb13 am: f9150bf362 am: 58612638d1 am: d9ea80d009 am: 46abcdd83f
...
am: 35063cdb3c
2016-11-14 14:22:02 +00:00
Narayan Kamath
2be8f11417
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into lmp-dev am: d60156dfc6 am: fd23b9d509 am: b0a7831375 am: 5594cfc2c3 am: 6ca924b884 am: ae457e03b7 am: 0c8da8aa05 am: 1f9abe310f am: f45a1a0fe6 am: 58d1705c64 am: 1886232f48 am: 9facd98e75
...
am: 38481c8a0f
2016-11-14 14:22:02 +00:00
Tony Mak
46aabe5ef4
Allow cross profile call between DO and PO
...
Allow DO to bind service of PO in managed profile and vice versa.
DO and PO must be the same package.
Bug: 31895999
Change-Id: I3ce2943aebd1249401d5814757a0ce25b9f85279
Test: cts-tradefed run cts --module DevicePolicyManager --test com.android.cts.devicepolicy.CorpOwnedManagedProfileTest
2016-11-14 14:20:11 +00:00
Charles He
c4a339a483
Enforce line-wrapping in DeviceAdminReceiver.java
...
Test: none
Change-Id: I6e60995fefafb18d8f9fda0f47f7aa822af438ca
2016-11-14 14:16:57 +00:00
Jerome Gaillard
99bb2b3d80
Merge "Change date on CustomCalendar"
2016-11-14 14:16:29 +00:00
Narayan Kamath
69bbca1dd7
Zygote: Additional whitelists for runtime overlay / other static resources. am: 0ad0e859f6 am: 1e6a5d11a6 am: f0cd32619e -s ours am: 4c26a969e9 am: b7884e5a9f am: da65c74c54 am: 24b2a54a84 am: 4a204149eb am: e58ee798c1 am: 83be5fdebb am: 4c5dc7e622 am: 6b7badc832
...
am: eda7110973
2016-11-14 14:14:18 +00:00
Narayan Kamath
11959bd5fc
Zygote : Block SIGCHLD during fork. am: b6f3751599 am: b23e864573 am: 52021073a4 am: 479385b6b3 am: 5f70cb0898 am: df3e599c7d am: 19ee3109e1
...
am: bf3c83eeac
2016-11-14 14:14:16 +00:00
neo.chae
0f51573bff
Fix idmap leak in zygote process am: 0244ca8d10 am: 82537abc3b am: 85afb42c16 am: b4b2203c5e am: fb74b8773a am: c58ec27e1c am: 7489336fed am: 0212d4f3fa am: aaf785c827 am: 4b72904585 am: 7530ea7ec0 am: fa2e233c30
...
am: b1d07e379c
2016-11-14 14:13:11 +00:00
Narayan Kamath
5db2340ba2
Zygote : Block SIGCHLD during fork. am: b1f1209d9a am: 35b8453338 am: 14bd75fa79 am: 50b0c3be57 -s ours am: e1e735bcb9 am: 072b70bae3 am: ba6d5ee377 am: f3f784853d am: 8ea47824fa am: 2f2611636b am: 86e1929551
...
am: 8ecbb2b2ae
2016-11-14 14:13:00 +00:00
Xin Li
2fc7ea4949
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev." into lmp-mr1-dev am: 78f15948fb am: 34de2a2d45 -s ours am: a5c82e7dd9 am: ca2abc5b71 am: ae5db8a6dc am: db984f917c -s ours am: ee6b51a05b am: 20def2e75f am: 6e8fef24d9 am: eb4de1706e am: 9d04aa4f81
...
am: 8ce3691f79
2016-11-14 14:11:51 +00:00
Narayan Kamath
aa9b2b17fd
Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev am: 7bd25ab485 am: a045aed7a2 am: 846f64c6fc am: 83b46a1590 am: 330d0ebf48 am: 21c1e58090 am: 81fd9e618c am: 2c13554c18 am: fb207962aa am: 44e645e59a am: f2a94f71fb
...
am: 48d16243f9
2016-11-14 14:11:46 +00:00
Andriy Naborskyy
5c47b5ec06
Merge "DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"" into cw-e-dev am: 11da2b5de3 -s ours am: 3f39609cff -s ours am: fb4beac069 -s ours am: 18305d920e -s ours am: 0a2ac837d1 -s ours
...
am: 415ec85fdb
2016-11-14 14:11:10 +00:00
Narayan Kamath
0bcb75b5e8
Zygote: Additional whitelisting for legacy devices. am: 7d302e018d am: f369b3ce75 am: e82866df3f am: f8335b6a59 am: 2f8ce5f5cb am: 5515b415aa am: d212aa9d13 am: 3b89a68a08 am: 146a0f86a6 am: 327edfeba2 am: 51930580bf
...
am: deabe2c324
2016-11-14 14:10:20 +00:00
Xin Li
2df92b919e
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev. am: 7e0483fcec -s ours am: 16090c6177 -s ours am: 0a568ae56e am: 9788dd5bd2 am: 6ec8dd10bb am: 921dd6a5fd -s ours am: 05a61276c6 am: 23270f1311 am: 5386c74a44 am: f3e0e13b54 am: 3a86cff442
...
am: 2129e3b757
2016-11-14 14:10:19 +00:00
Andriy Naborskyy
2480121100
DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous" am: c5bf8bc74d -s ours am: f380f53752 -s ours am: dbbde14239 -s ours am: f566a1d4bf -s ours am: e26d15582b -s ours
...
am: bb1dfdc660
2016-11-14 14:09:55 +00:00
Narayan Kamath
38481c8a0f
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into lmp-dev am: d60156dfc6 am: fd23b9d509 am: b0a7831375 am: 5594cfc2c3 am: 6ca924b884 am: ae457e03b7 am: 0c8da8aa05 am: 1f9abe310f am: f45a1a0fe6 am: 58d1705c64 am: 1886232f48
...
am: 9facd98e75
2016-11-14 14:09:01 +00:00
Narayan Kamath
f5d2a4eb6a
Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev am: 75c6b8c324 am: 9958eb7180 am: 5e92ece8c2 am: 77decadefe am: 11b3161c41 am: 5cbd448348 am: a9fae33c11 am: 05f59b1f1d am: ec69d20c3d
...
am: 3fca84af72
2016-11-14 14:08:59 +00:00
Brian Carlstrom
35063cdb3c
Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev am: 5d0cabf78e am: 3be5dec18a am: b272d7cb13 am: f9150bf362 am: 58612638d1 am: d9ea80d009
...
am: 46abcdd83f
2016-11-14 14:08:51 +00:00
Narayan Kamath
bf3c83eeac
Zygote : Block SIGCHLD during fork. am: b6f3751599 am: b23e864573 am: 52021073a4 am: 479385b6b3 am: 5f70cb0898 am: df3e599c7d
...
am: 19ee3109e1
2016-11-14 14:03:02 +00:00
Narayan Kamath
8ecbb2b2ae
Zygote : Block SIGCHLD during fork. am: b1f1209d9a am: 35b8453338 am: 14bd75fa79 am: 50b0c3be57 -s ours am: e1e735bcb9 am: 072b70bae3 am: ba6d5ee377 am: f3f784853d am: 8ea47824fa am: 2f2611636b
...
am: 86e1929551
2016-11-14 14:01:54 +00:00
Narayan Kamath
eda7110973
Zygote: Additional whitelists for runtime overlay / other static resources. am: 0ad0e859f6 am: 1e6a5d11a6 am: f0cd32619e -s ours am: 4c26a969e9 am: b7884e5a9f am: da65c74c54 am: 24b2a54a84 am: 4a204149eb am: e58ee798c1 am: 83be5fdebb am: 4c5dc7e622
...
am: 6b7badc832
2016-11-14 14:01:40 +00:00
Narayan Kamath
0b24d91754
Zygote: Additional whitelisting for legacy devices. am: 5e2f7c6229 am: 6bf96c1192 am: 22e45fa247 am: d98e75feca am: 87dc13f249 am: c50c43667f am: a5ff6c84a2 am: 9efaadccc0 am: 6861821082
...
am: 1907f3b17e
2016-11-14 14:01:34 +00:00
