Pankaj Kanwar
99291e8f35
Merge "Notify user when user fails to connect to the network." into nyc-mr2-dev
2016-12-16 16:00:14 +00:00
TreeHugger Robot
e59dc4124a
Merge "try to stop using exotic clipps"
2016-12-16 15:49:47 +00:00
Andrew Scull
5daf273b7e
Don't save the password metrics to disk.
...
Only store the metrics in RAM, computing them at first log in.
Test: com.android.cts.devicepolicy.DeviceAdminHostSideTestApi24
Bug: 32793550
Change-Id: Iaf9516c193f054331e3e2c68cb3f627bd543b408
2016-12-16 15:30:14 +00:00
Robin Lee
9f4ab32b1c
Blank out recents for locked work tasks
...
Bug: 31001762
Test: WIP TaskViewThumbnailTest.java
Change-Id: I259fa95f642b83728904653c75efc7e417b0ab60
2016-12-16 14:37:12 +00:00
Ivan Podogov
d2d32b1f32
In permission review mode, always request user's consent to toggle BT.
...
Bug: 33155221
Change-Id: Ic1ed987bbaf282892a2aef354a8ca0add2c829ba
2016-12-16 11:16:43 +00:00
Polina Bondarenko
bcdc5d748e
Merge "Make TelephonyManager APIs public:" am: 441bfc6718 am: 104a5c7a34 am: bab9a7e66e
...
am: f5088c0d77
2016-12-16 11:02:19 +00:00
Polina Bondarenko
f5088c0d77
Merge "Make TelephonyManager APIs public:" am: 441bfc6718 am: 104a5c7a34
...
am: bab9a7e66e
2016-12-16 10:53:30 +00:00
Polina Bondarenko
bab9a7e66e
Merge "Make TelephonyManager APIs public:" am: 441bfc6718
...
am: 104a5c7a34
2016-12-16 10:45:03 +00:00
Polina Bondarenko
104a5c7a34
Merge "Make TelephonyManager APIs public:"
...
am: 441bfc6718
2016-12-16 10:37:21 +00:00
Treehugger Robot
441bfc6718
Merge "Make TelephonyManager APIs public:"
2016-12-16 10:29:04 +00:00
Colin Cross
a38f3310f9
Merge "Move libandroid_runtime headers into frameworks/base/core/jni" am: 541845908c am: 29d7284285 am: 2d9b7015a1
...
am: 2bb2684841
2016-12-16 09:20:41 +00:00
Colin Cross
cae60e0f90
Move libandroid_runtime headers into frameworks/base/core/jni am: 71044fe7e5 am: 7f63febbc4 am: b1a3ae1f54
...
am: 4f8c759959
2016-12-16 09:18:09 +00:00
Ruben Brunk
cc502f3197
Merge "Don't call into VrManagerService with AM lock." into nyc-mr2-dev am: 2bfb3155d9
...
am: f0df278823
2016-12-16 09:14:54 +00:00
Colin Cross
2bb2684841
Merge "Move libandroid_runtime headers into frameworks/base/core/jni" am: 541845908c am: 29d7284285
...
am: 2d9b7015a1
2016-12-16 09:14:53 +00:00
Ruben Brunk
757a583389
Don't call into VrManagerService with AM lock. am: 27b53cfe88
...
am: cc43150bd7
2016-12-16 09:13:55 +00:00
Colin Cross
4f8c759959
Move libandroid_runtime headers into frameworks/base/core/jni am: 71044fe7e5 am: 7f63febbc4
...
am: b1a3ae1f54
2016-12-16 09:13:54 +00:00
Colin Cross
2d9b7015a1
Merge "Move libandroid_runtime headers into frameworks/base/core/jni" am: 541845908c
...
am: 29d7284285
2016-12-16 09:06:49 +00:00
Ruben Brunk
f0df278823
Merge "Don't call into VrManagerService with AM lock." into nyc-mr2-dev
...
am: 2bfb3155d9
2016-12-16 09:06:00 +00:00
Ruben Brunk
cc43150bd7
Don't call into VrManagerService with AM lock.
...
am: 27b53cfe88
2016-12-16 09:05:54 +00:00
Colin Cross
b1a3ae1f54
Move libandroid_runtime headers into frameworks/base/core/jni am: 71044fe7e5
...
am: 7f63febbc4
2016-12-16 09:05:54 +00:00
Colin Cross
29d7284285
Merge "Move libandroid_runtime headers into frameworks/base/core/jni"
...
am: 541845908c
2016-12-16 08:57:55 +00:00
Colin Cross
7f63febbc4
Move libandroid_runtime headers into frameworks/base/core/jni
...
am: 71044fe7e5
2016-12-16 08:57:51 +00:00
TreeHugger Robot
2bfb3155d9
Merge "Don't call into VrManagerService with AM lock." into nyc-mr2-dev
2016-12-16 08:53:57 +00:00
Treehugger Robot
541845908c
Merge "Move libandroid_runtime headers into frameworks/base/core/jni"
2016-12-16 08:46:59 +00:00
Ruben Brunk
b358b736e2
Merge "Fix VR interaction with screen on/off/lockscreen."
2016-12-16 06:46:54 +00:00
Android Build Merger (Role)
de467b53a6
Merge "Merge "Merge "docs: changes to broadcast documentation" into nyc-mr1-dev am: 7b22d549d4 am: b825c71446 am: ad7fe271ae" into nyc-mr2-dev-plus-aosp am: 412ff4dde5"
2016-12-16 05:35:40 +00:00
Android Build Merger (Role)
48c23efb97
Merge "Merge "docs: changes to broadcast documentation" into nyc-mr1-dev am: 7b22d549d4 am: b825c71446 am: ad7fe271ae am: 4bf240adda"
2016-12-16 05:35:23 +00:00
Mark Lu
d7dd23bdb6
Merge "Merge "docs: changes to broadcast documentation" into nyc-mr1-dev am: 7b22d549d4 am: b825c71446 am: ad7fe271ae" into nyc-mr2-dev-plus-aosp
...
am: 412ff4dde5
2016-12-16 05:34:42 +00:00
Mark Lu
008a71ee24
Merge "docs: changes to broadcast documentation" into nyc-mr1-dev am: 7b22d549d4 am: b825c71446 am: ad7fe271ae
...
am: 4bf240adda
2016-12-16 05:34:32 +00:00
TreeHugger Robot
f6bd92e0dc
Merge "Includes key/value on exception thrown when they're too large."
2016-12-16 05:34:09 +00:00
Mark Lu
1cd979eaab
Merge "Merge "docs: changes to broadcast documentation" into nyc-mr1-dev am: 7b22d549d4 am: b825c71446 am: db8fdee7a4" into nyc-mr2-dev-plus-aosp
...
am: cb9dcbbc7f
2016-12-16 05:33:03 +00:00
Mark Lu
c4490cecd5
Merge "docs: changes to broadcast documentation" into nyc-mr1-dev am: 7b22d549d4 am: b825c71446 am: db8fdee7a4
...
am: 49ad42a12f
2016-12-16 05:32:56 +00:00
Mark Lu
abf7dc0ecf
Merge "docs: changes to broadcast documentation am: 33ec106d22 am: 377dab8ab3 am: 1c5a117342" into nyc-mr2-dev-plus-aosp
...
am: 482917510b
2016-12-16 05:31:35 +00:00
Mark Lu
b6c011864c
docs: changes to broadcast documentation am: 33ec106d22 am: 377dab8ab3 am: 1c5a117342
...
am: 9270be9a0a
2016-12-16 05:31:26 +00:00
Mark Lu
bce1e456dc
docs: changes to broadcast documentation am: 33ec106d22 am: 377dab8ab3 am: fd737791e8
...
am: 45d6ba7b98
2016-12-16 05:30:20 +00:00
Android Build Merger (Role)
412ff4dde5
Merge "Merge "docs: changes to broadcast documentation" into nyc-mr1-dev am: 7b22d549d4 am: b825c71446 am: ad7fe271ae" into nyc-mr2-dev-plus-aosp
2016-12-16 05:16:19 +00:00
Android Build Merger (Role)
cb9dcbbc7f
Merge "Merge "docs: changes to broadcast documentation" into nyc-mr1-dev am: 7b22d549d4 am: b825c71446 am: db8fdee7a4" into nyc-mr2-dev-plus-aosp
2016-12-16 05:16:03 +00:00
Mark Lu
4bf240adda
Merge "docs: changes to broadcast documentation" into nyc-mr1-dev am: 7b22d549d4 am: b825c71446
...
am: ad7fe271ae
2016-12-16 05:15:38 +00:00
Mark Lu
49ad42a12f
Merge "docs: changes to broadcast documentation" into nyc-mr1-dev am: 7b22d549d4 am: b825c71446
...
am: db8fdee7a4
2016-12-16 05:15:28 +00:00
Android Build Merger (Role)
482917510b
Merge "docs: changes to broadcast documentation am: 33ec106d22 am: 377dab8ab3 am: 1c5a117342" into nyc-mr2-dev-plus-aosp
2016-12-16 05:15:15 +00:00
Mark Lu
9270be9a0a
docs: changes to broadcast documentation am: 33ec106d22 am: 377dab8ab3
...
am: 1c5a117342
2016-12-16 05:14:40 +00:00
Mark Lu
45d6ba7b98
docs: changes to broadcast documentation am: 33ec106d22 am: 377dab8ab3
...
am: fd737791e8
2016-12-16 05:14:34 +00:00
Mark Lu
db8fdee7a4
Merge "docs: changes to broadcast documentation" into nyc-mr1-dev am: 7b22d549d4
...
am: b825c71446
2016-12-16 05:07:35 +00:00
Mark Lu
ad7fe271ae
Merge "docs: changes to broadcast documentation" into nyc-mr1-dev am: 7b22d549d4
...
am: b825c71446
2016-12-16 05:07:28 +00:00
Mark Lu
fd737791e8
docs: changes to broadcast documentation am: 33ec106d22
...
am: 377dab8ab3
2016-12-16 05:06:42 +00:00
Mark Lu
1c5a117342
docs: changes to broadcast documentation am: 33ec106d22
...
am: 377dab8ab3
2016-12-16 05:06:37 +00:00
Mark Lu
b825c71446
Merge "docs: changes to broadcast documentation" into nyc-mr1-dev
...
am: 7b22d549d4
2016-12-16 04:59:10 +00:00
Mark Lu
377dab8ab3
docs: changes to broadcast documentation
...
am: 33ec106d22
2016-12-16 04:59:08 +00:00
Ruben Brunk
fecb615093
Fix VR interaction with screen on/off/lockscreen.
...
- Add mechanism to prevent VR mode from being enabled.
- Disable VR mode while screen is off, or user is in lockscreen,
and re-enable when this is no longer the case.
Test: Fix merge from nyc-mr2-dev.
Bug: 31665197
Bug: 33655854
Change-Id: If777e0ef40b29bff42722f2aa10cff86a5831bc0
2016-12-15 20:56:23 -08:00
Ruben Brunk
27b53cfe88
Don't call into VrManagerService with AM lock.
...
Bug: 33655854
Merged-In: If777e0ef40b29bff42722f2aa10cff86a5831bc0
Change-Id: I365d0033cf20172cee57b0ef2a53dd8648640c8d
2016-12-15 20:50:32 -08:00
