Android Build Merger (Role)
e6d4e7ddb4
Merge "Merge "Add timeout to StrictMode flash." into oc-dev am: fdb3d31504 am: 13e4dfdceb" into oc-dr1-dev-plus-aosp
2017-06-08 05:56:33 +00:00
Hall Liu
7d576f60f2
Merge "Embms download setup" am: da5b77fa9b am: a807ee8f1c
...
am: b6a16546b5
2017-06-08 05:55:56 +00:00
Android Build Merger (Role)
a985db2fb7
Merge "Merge "Framework: Remove SamplingProfiler" into oc-dev-plus-aosp am: 837f1167ca" into oc-dr1-dev-plus-aosp
2017-06-08 05:55:33 +00:00
Jeff Sharkey
6d04677fba
Merge "Add timeout to StrictMode flash." into oc-dev am: fdb3d31504
...
am: 13e4dfdceb
2017-06-08 05:55:32 +00:00
Android Build Merger (Role)
a8ae3296e2
Merge "Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev am: f34713066e am: 2bb4966dab" into oc-dr1-dev-plus-aosp
2017-06-08 05:55:08 +00:00
Todd Kennedy
23e5a1ee65
Merge changes Iea24e5a1,If71385bc into oc-dev
...
am: 3834421c96
2017-06-08 05:54:33 +00:00
Andreas Gampe
f037caed37
Merge "Framework: Remove SamplingProfiler" into oc-dev-plus-aosp
...
am: 837f1167ca
2017-06-08 05:54:32 +00:00
Sudheer Shanka
962ed48f50
Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev am: f34713066e
...
am: 2bb4966dab
2017-06-08 05:53:00 +00:00
Phil Weaver
7c44479edf
Merge "Confirm a11y shortcut service for correct user" into oc-dev
...
am: 03a5b3a509
2017-06-08 05:52:11 +00:00
Todd Kennedy
b524ada719
Merge "Passing callingUid to internal methods" into oc-dev am: dacdf2e978
...
am: ddb322a000
2017-06-08 05:52:09 +00:00
Todd Kennedy
de066fd249
Merge "Passing callingUid to internal methods" into oc-dev
...
am: dacdf2e978
2017-06-08 05:50:03 +00:00
Android Build Merger (Role)
c5deced1d8
Merge "Merge "Add timeout to StrictMode flash." into oc-dev am: fdb3d31504 am: b1a2cde4fd" into oc-dr1-dev-plus-aosp
2017-06-08 05:49:19 +00:00
Android Build Merger (Role)
c9208d362f
Merge "Merge "resolve merge conflicts of 695f21a661 to oc-dr1-dev" into oc-dr1-dev am: be261948cb" into oc-dr1-dev-plus-aosp
2017-06-08 05:48:49 +00:00
Jeff Sharkey
b9fe492ddd
Merge "Add timeout to StrictMode flash." into oc-dev am: fdb3d31504
...
am: b1a2cde4fd
2017-06-08 05:48:21 +00:00
Jeff Sharkey
13e4dfdceb
Merge "Add timeout to StrictMode flash." into oc-dev
...
am: fdb3d31504
2017-06-08 05:47:38 +00:00
Ian Pedowitz
8a03d88812
Merge "resolve merge conflicts of 695f21a661 to oc-dr1-dev" into oc-dr1-dev
...
am: be261948cb
2017-06-08 05:46:25 +00:00
Sudheer Shanka
54a6869814
Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev am: f34713066e
...
am: 736cb0e33a
2017-06-08 05:45:37 +00:00
Sudheer Shanka
2bb4966dab
Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev
...
am: f34713066e
2017-06-08 05:44:49 +00:00
Ian Pedowitz
851bfc38d4
Merge "resolve merge conflicts of 7ea4f66f35 to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp
2017-06-08 05:42:24 +00:00
Ian Pedowitz
be261948cb
Merge "resolve merge conflicts of 695f21a661 to oc-dr1-dev" into oc-dr1-dev
2017-06-08 05:42:18 +00:00
Etan Cohen
d35a439a90
Merge "[AWARE] Add validity check on PMK/Passphrase lengths" into oc-dr1-dev
...
am: 89d6859dc4
2017-06-08 05:32:09 +00:00
Etan Cohen
89d6859dc4
Merge "[AWARE] Add validity check on PMK/Passphrase lengths" into oc-dr1-dev
2017-06-08 05:26:21 +00:00
Felipe Leme
07d2221218
Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev
...
am: 9be8c96918
2017-06-08 05:25:17 +00:00
Felipe Leme
9be8c96918
Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev
2017-06-08 05:21:08 +00:00
Kevin Chyn
f0e1d6eab8
Add setting and permission for assist gesture
...
am: 4fddc9fa4d
2017-06-08 04:53:31 +00:00
Mark Rathjen
53bdeb1a46
Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev
...
am: 3492ed4376
2017-06-08 04:50:16 +00:00
Mark Rathjen
3492ed4376
Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev
2017-06-08 04:44:07 +00:00
Kevin Chyn
4fddc9fa4d
Add setting and permission for assist gesture
...
Bug: 37427306
Test: manual
Merged-In: I659fa43fb085575df4d62e7765d88c6fd615fb7d
Change-Id: I659fa43fb085575df4d62e7765d88c6fd615fb7d
2017-06-07 21:42:55 -07:00
Yuchen He
c592c63a2d
Merge "Fix AeModeAndLock test cases. Bug: 36103813" into oc-dev
...
am: 3671e9249b
2017-06-08 04:38:16 +00:00
Yuchen He
3671e9249b
Merge "Fix AeModeAndLock test cases. Bug: 36103813" into oc-dev
2017-06-08 04:32:36 +00:00
Andreas Gampe
76f6da62e6
Merge "Framework: Remove SamplingProfiler" am: d2ecee2506
...
am: 3ea0309e39
2017-06-08 03:22:23 +00:00
Andreas Gampe
3ea0309e39
Merge "Framework: Remove SamplingProfiler"
...
am: d2ecee2506
2017-06-08 03:16:54 +00:00
Treehugger Robot
d2ecee2506
Merge "Framework: Remove SamplingProfiler"
2017-06-08 03:05:59 +00:00
Ian Pedowitz
5eee5988c1
resolve merge conflicts of 7ea4f66f35 to oc-dr1-dev-plus-aosp
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I6f26542780c2b911e6aeea187c22e9d70823cd7a
Merged-In: I558447f282bb54f13be1622c3f2528a383fbc3b7
2017-06-07 19:54:21 -07:00
Ian Pedowitz
a27856d443
resolve merge conflicts of 695f21a661 to oc-dr1-dev
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ifeffa55c7fb80b0f327ecc5b50cefeca9db6457b
Merged-In: I558447f282bb54f13be1622c3f2528a383fbc3b7
2017-06-07 19:52:10 -07:00
Adam Bookatz
300ebee8c4
Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev
...
am: 6029bce3b4
2017-06-08 02:48:32 +00:00
Adam Bookatz
6029bce3b4
Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev
2017-06-08 02:43:20 +00:00
Svetoslav Ganov
2dcedc1276
Ensure only test print services enabled - framework
...
Test: cts-tradefed run cts-dev -m CtsPrintTestCas
bug:62232727
Change-Id: I1050272586d1c03dc1b1dfdb8b10e258912a249b
2017-06-07 18:50:05 -07:00
Todd Kennedy
4d2a9a9f50
Merge changes Iea24e5a1,If71385bc into oc-dev
...
am: 3834421c96
2017-06-08 01:49:03 +00:00
Phil Weaver
3d5bf99e7f
Merge "Confirm a11y shortcut service for correct user" into oc-dev
...
am: 03a5b3a509
2017-06-08 01:45:56 +00:00
TreeHugger Robot
3834421c96
Merge changes Iea24e5a1,If71385bc into oc-dev
...
* changes:
expand who can uninstall an instant app
Final changes to protect the API surface
2017-06-08 01:40:07 +00:00
Phil Weaver
03a5b3a509
Merge "Confirm a11y shortcut service for correct user" into oc-dev
2017-06-08 01:37:48 +00:00
Hall Liu
b6a16546b5
Merge "Embms download setup" am: da5b77fa9b
...
am: a807ee8f1c
2017-06-08 01:32:43 +00:00
Hall Liu
a807ee8f1c
Merge "Embms download setup"
...
am: da5b77fa9b
2017-06-08 01:26:28 +00:00
Hall Liu
da5b77fa9b
Merge "Embms download setup"
2017-06-08 01:20:49 +00:00
Daichi Hirono
fecc78036d
Fix NPE in MtpDocumentsProviderTests
...
Previous patch ag/2250238 broke MtpDocumentsProviderTests since
ServiceIntentSender's constructor refers the context argument which is
null in the tests.
The CL adds a test version of the constructor which does not use the
context argument in it.
Bug: 38363487
Test: MtpDocumentsProviderTests
Change-Id: I68a1d8cb6997499e5069c33f70fd0f675aaad77c
(cherry picked from commit c5949bd39c
2017-06-08 01:19:49 +00:00
TreeHugger Robot
837f1167ca
Merge "Framework: Remove SamplingProfiler" into oc-dev-plus-aosp
2017-06-08 01:08:24 +00:00
Todd Kennedy
ddb322a000
Merge "Passing callingUid to internal methods" into oc-dev
...
am: dacdf2e978
2017-06-08 01:05:25 +00:00
Selim Cinek
131f1a4bc4
Fixed a bug where the navigation notification would flicker
...
Change-Id: Id68ba339407287d67d8db888515389e79e09ece3
Fixes: 62339936
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationCustomViewWrapperTest.java
2017-06-07 18:04:57 -07:00
TreeHugger Robot
dacdf2e978
Merge "Passing callingUid to internal methods" into oc-dev
2017-06-08 01:00:52 +00:00
