Paul Duffin
783096f02c
Merge "Add legacy-test as replacement for core-junit" am: e75a82a92f
...
am: a485fa1fce
2016-11-30 12:20:11 +00:00
Paul Duffin
a485fa1fce
Merge "Add legacy-test as replacement for core-junit"
...
am: e75a82a92f
2016-11-30 12:15:14 +00:00
Paul Duffin
e75a82a92f
Merge "Add legacy-test as replacement for core-junit"
2016-11-30 12:04:23 +00:00
Paul Duffin
a856247e3a
Merge "Add legacy-test as replacement for core-junit"
2016-11-30 12:00:02 +00:00
Andrei Stingaceanu
6b92a910e1
Merge "AutoSize TextView (part 2) - benchmark number of sizes"
2016-11-30 11:02:54 +00:00
Bartosz Fabianowski
dd7f8dafd8
Allow DO to access DevicePolicyManager.isDeviceManaged()
...
This CL makes DPM.isDeviceManaged() accessible to the DO so that it
can be CTS-tested.
Bug: 32692748
Test: Device policy manager unit test + CTS & GTS in separate CLs
Change-Id: I5326e86b0ffee81d04bd48f0267044463a899b78
2016-11-30 11:09:22 +01:00
TreeHugger Robot
9f9e453b64
Merge "Unit test for getBindDeviceAdminTargetUsers"
2016-11-30 09:58:11 +00:00
Mark Lu
13b590bc5b
Merge "Fix batterySendBroadcast not synchronized issue." am: 32e756a4bc am: 15df815e1e am: e5a3ad23fd
...
am: 835932f4c5
2016-11-30 09:30:08 +00:00
Mark Lu
835932f4c5
Merge "Fix batterySendBroadcast not synchronized issue." am: 32e756a4bc am: 15df815e1e
...
am: e5a3ad23fd
2016-11-30 09:24:30 +00:00
Mark Lu
e5a3ad23fd
Merge "Fix batterySendBroadcast not synchronized issue." am: 32e756a4bc
...
am: 15df815e1e
2016-11-30 09:19:26 +00:00
Mark Lu
15df815e1e
Merge "Fix batterySendBroadcast not synchronized issue."
...
am: 32e756a4bc
2016-11-30 09:14:31 +00:00
Treehugger Robot
32e756a4bc
Merge "Fix batterySendBroadcast not synchronized issue."
2016-11-30 07:59:55 +00:00
TreeHugger Robot
bece7278d3
Merge "Add an option to bit to not restart."
2016-11-30 04:49:23 +00:00
TreeHugger Robot
3bf738edf0
Merge "Check if the display is attached when updating config"
2016-11-30 04:33:39 +00:00
Anthony Hugh
88fd91cc80
Merge "Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback" into cw-f-dev am: 75bf81458e am: c27f8b025f" into nyc-mr2-dev-plus-aosp
...
am: d644b89a35
2016-11-30 03:43:13 +00:00
Anthony Hugh
5e7fabb893
Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback" into cw-f-dev am: 75bf81458e am: c27f8b025f
...
am: a87e824100
2016-11-30 03:43:08 +00:00
Anthony Hugh
b494d18c25
Merge "Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback" into cw-f-dev am: 75bf81458e am: f3eef9a286" into nyc-mr2-dev-plus-aosp
...
am: a351145b9b
2016-11-30 03:41:33 +00:00
Anthony Hugh
45b1ec8e53
Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback" into cw-f-dev am: 75bf81458e am: f3eef9a286
...
am: 219451211d
2016-11-30 03:41:29 +00:00
Anthony Hugh
0f68eb2224
Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback am: f73d085395 am: c2ca17711e" into nyc-mr2-dev-plus-aosp
...
am: 6abec50032
2016-11-30 03:39:45 +00:00
Anthony Hugh
c3ac4a2025
DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback am: f73d085395 am: c2ca17711e
...
am: 1b9cec4860
2016-11-30 03:39:41 +00:00
Anthony Hugh
faeb1f394e
DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback am: f73d085395 am: 32a0b7351e
...
am: 9d6bb6929a
2016-11-30 03:38:35 +00:00
Android Build Merger (Role)
d644b89a35
Merge "Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback" into cw-f-dev am: 75bf81458e am: c27f8b025f" into nyc-mr2-dev-plus-aosp
2016-11-30 03:35:37 +00:00
Android Build Merger (Role)
a351145b9b
Merge "Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback" into cw-f-dev am: 75bf81458e am: f3eef9a286" into nyc-mr2-dev-plus-aosp
2016-11-30 03:35:10 +00:00
Anthony Hugh
a87e824100
Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback" into cw-f-dev am: 75bf81458e
...
am: c27f8b025f
2016-11-30 03:34:52 +00:00
Anthony Hugh
219451211d
Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback" into cw-f-dev am: 75bf81458e
...
am: f3eef9a286
2016-11-30 03:34:28 +00:00
Android Build Merger (Role)
6abec50032
Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback am: f73d085395 am: c2ca17711e" into nyc-mr2-dev-plus-aosp
2016-11-30 03:34:28 +00:00
Anthony Hugh
1b9cec4860
DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback am: f73d085395
...
am: c2ca17711e
2016-11-30 03:33:39 +00:00
Anthony Hugh
9d6bb6929a
DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback am: f73d085395
...
am: 32a0b7351e
2016-11-30 03:33:28 +00:00
Anthony Hugh
f3eef9a286
Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback" into cw-f-dev
...
am: 75bf81458e
2016-11-30 03:28:44 +00:00
Anthony Hugh
c27f8b025f
Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback" into cw-f-dev
...
am: 75bf81458e
2016-11-30 03:28:39 +00:00
Anthony Hugh
32a0b7351e
DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback
...
am: f73d085395
2016-11-30 03:28:37 +00:00
Anthony Hugh
c2ca17711e
DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback
...
am: f73d085395
2016-11-30 03:28:34 +00:00
Romain Guy
e842e50d42
Add fallback case in glGetShaderInfoLog
...
Some drivers do not always report the proper info log length
through glGetShaderiv which causes the JNI bindings to return
an empty log string. This change falls back to a length of
512 bytes when the queried length is 0. This is the same
fallback used in libhwui.
Test: CtsOpenGLTest
Bug: 16624915
Change-Id: I86ea52903b280a86305eaaa83eefcf46a7a8d0b4
2016-11-29 19:26:29 -08:00
TreeHugger Robot
75bf81458e
Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback" into cw-f-dev
2016-11-30 03:09:24 +00:00
TreeHugger Robot
3faa7c0160
Merge "Don't tie ephemeral resolver/installer"
2016-11-30 02:21:46 +00:00
Joe Onorato
6592c3cc8f
Add an option to bit to not restart.
...
Test: build & restart
Change-Id: Ia925053f04046d7fb91a47cfd5fd17a5d4fecf10
2016-11-29 17:36:36 -08:00
Andreas Gampe
428e65d62a
Merge "Preload2: Add sequence UI" am: 56ddac7fd7 am: b9d8535a21 am: 04cbf97d38
...
am: a9b85deae7
2016-11-30 01:31:58 +00:00
Pankaj Kanwar
cf77820cae
Merge "Allow Carriers to specify Wifi Networks." into nyc-mr2-dev am: 3a122d10fa
...
am: 0d57eb0c69
2016-11-30 01:30:53 +00:00
pkanwar
56fe9cb276
Allow Carriers to specify Wifi Networks. am: 1ec8fe940f
...
am: f6414d42e4
2016-11-30 01:29:50 +00:00
Fyodor Kupolov
d072d14154
Support disabled/log/enforce in ro.control_privapp_permissions
...
Possible values:
- disable - the feature is completely disabled - signature|privileged
permissions are granted automatically without logging. Default behavior
- log - log grants of signature|privileged permissions to privileged apps
that were not whitelisted in /etc/permissions/privapp-permissions.xml.
- enforce - enforce that only whitelisted permissions are granted.
Only devices with ro.control_privapp_permission=enforce will pass CTS tests.
Test: Manual - device boots, permissions are granted
Bug:31008485
Change-Id: I24e0c75d2efc326c9fbec35efc92489313667212
2016-11-29 17:20:00 -08:00
Yirui Huang
e4b016ec41
Merge "Introduce font variation settings parser"
2016-11-30 01:13:04 +00:00
Andreas Gampe
a9b85deae7
Merge "Preload2: Add sequence UI" am: 56ddac7fd7 am: b9d8535a21
...
am: 04cbf97d38
2016-11-30 01:04:24 +00:00
Andreas Gampe
04cbf97d38
Merge "Preload2: Add sequence UI" am: 56ddac7fd7
...
am: b9d8535a21
2016-11-30 00:59:23 +00:00
Andreas Gampe
b9d8535a21
Merge "Preload2: Add sequence UI"
...
am: 56ddac7fd7
2016-11-30 00:49:44 +00:00
Pankaj Kanwar
0d57eb0c69
Merge "Allow Carriers to specify Wifi Networks." into nyc-mr2-dev
...
am: 3a122d10fa
2016-11-30 00:40:27 +00:00
pkanwar
f6414d42e4
Allow Carriers to specify Wifi Networks.
...
am: 1ec8fe940f
2016-11-30 00:40:22 +00:00
Treehugger Robot
56ddac7fd7
Merge "Preload2: Add sequence UI"
2016-11-30 00:39:19 +00:00
Todd Kennedy
e16a8abd7c
Don't tie ephemeral resolver/installer
...
The ephemeral resolver and installer can now be added at separate
times. It will be possible to replace the installer dynamically.
Bug: 33073532
Test: Manual. Verify the installer and resolver are set correctly with different configurations.
Change-Id: I8071de8c5baadd03c9eb3e756ed7445d2116d51f
2016-11-29 16:37:16 -08:00
TreeHugger Robot
5ab97721bc
Merge "Don't change visibility of fragment Views that aren't visible"
2016-11-30 00:36:05 +00:00
Pankaj Kanwar
3a122d10fa
Merge "Allow Carriers to specify Wifi Networks." into nyc-mr2-dev
2016-11-30 00:33:37 +00:00
