Makoto Onuki
5c12df642b
Merge "Tiny improvement on UserInfo.getUserHandle()"
2019-10-09 21:57:42 +00:00
TreeHugger Robot
e2c5308f03
Merge "Adds null check before applyPostResolutionFilter"
2019-10-09 21:22:28 +00:00
Yincheng Zhao
6a98a37a3c
Merge "Adding API in TelephonyManger for updating Fplmns."
2019-10-09 21:03:46 +00:00
Chavi Weingarten
ca80d5b65b
Merge "Replace SurfaceControl call points with Transaction calls (1/n)"
2019-10-09 20:59:48 +00:00
chaviw
619da69f9e
Replace SurfaceControl call points with Transaction calls (1/n)
...
Removed calls to SurfaceControl methods that use the sGlobalTransaction
and changed to use the Transaction methods. Removed from all classes
except from WindowSurfaceController and deleted all unused methods from
SurfaceControl.
Test: go/wm-smoke
Change-Id: I69228214bdece20ea481c6d8041321f8385a446a
Exempt-From-Owner-Approval: Santos already +1'ed
2019-10-09 20:55:47 +00:00
TreeHugger Robot
cd7610e1b1
Merge "Improve test using Mockito.argThat() matcher"
2019-10-09 20:54:30 +00:00
Ruchir Rastogi
0abc501032
Merge "Refactor MetricActivation initialization"
2019-10-09 20:47:22 +00:00
Felipe Leme
50db98765f
Merge "(Minor) fix on ActivityManagerService.LocalService.getCurrentUserId()" into qt-qpr1-dev am: 5811f47755
...
am: 6bf45f9967
2019-10-09 13:40:43 -07:00
Felipe Leme
6bf45f9967
Merge "(Minor) fix on ActivityManagerService.LocalService.getCurrentUserId()" into qt-qpr1-dev
...
am: 5811f47755
2019-10-09 13:33:49 -07:00
Beverly Tai
d0910de73a
Merge "Add NotifLogs throughout SystemUI"
2019-10-09 20:18:54 +00:00
TreeHugger Robot
5811f47755
Merge "(Minor) fix on ActivityManagerService.LocalService.getCurrentUserId()" into qt-qpr1-dev
2019-10-09 20:08:47 +00:00
Soonil Nagarkar
503be6e625
Merge "LocationManager cleanups to make CTS tests easier"
2019-10-09 19:50:24 +00:00
Paul Duffin
d580f29ec2
Merge "Allow incremental replacement of filegroups with stubs source" am: 25843c7670 am: f7e1966d08 am: 4c31b70917
...
am: f48fba4da8
2019-10-09 12:43:08 -07:00
Paul Duffin
f48fba4da8
Merge "Allow incremental replacement of filegroups with stubs source" am: 25843c7670 am: f7e1966d08
...
am: 4c31b70917
2019-10-09 12:29:28 -07:00
Lucas Dupin
e79618fd1d
Do not register lift when sensor is not present am: 0a410d3a6c
...
am: e64e30fb68
2019-10-09 12:26:05 -07:00
Jordan Liu
33af2b8a0b
Merge "Rename DEFAULT_CARD_INDEX" am: 038d1b5b27 am: 6802dbb6d5 am: 520be09949
...
am: 87bc4f1ee7
2019-10-09 12:22:56 -07:00
Hall Liu
75ab96a83f
Merge "Fix race in TelephonyScanManager" am: 884dd0f559 am: 0c85ca1062 am: 8fd8b5b234
...
am: f67ba767a0
2019-10-09 12:16:50 -07:00
Lucas Dupin
e64e30fb68
Do not register lift when sensor is not present
...
am: 0a410d3a6c
2019-10-09 12:16:40 -07:00
Paul Duffin
4c31b70917
Merge "Allow incremental replacement of filegroups with stubs source" am: 25843c7670
...
am: f7e1966d08
2019-10-09 12:16:35 -07:00
Jordan Liu
87bc4f1ee7
Merge "Rename DEFAULT_CARD_INDEX" am: 038d1b5b27 am: 6802dbb6d5
...
am: 520be09949
2019-10-09 12:12:42 -07:00
Hall Liu
f67ba767a0
Merge "Fix race in TelephonyScanManager" am: 884dd0f559 am: 0c85ca1062
...
am: 8fd8b5b234
2019-10-09 12:08:46 -07:00
Tobias Thierer
6f70d2f9f0
Merge "vendor.mime.types: Revert accidental modification." am: b6a549d916 am: f73856beb1 am: 49c327fc48
...
am: 38c88d3f68
2019-10-09 12:08:44 -07:00
Patrick Baumann
92cfd86bf4
Adds null check before applyPostResolutionFilter
...
Calls to mComponentResolver.query* may return null. This change
appropriately annotates those methods and does checks before passing the
results on to applyPostResolutionFilter (which has also been annotated).
Test: atest DeviceOwnerPlusProfileOwnerTest.testWipeData_managedProfile
Fixes: 142311634
Change-Id: I911041c87964a117f60a71d0957d42f16a7ab8cb
2019-10-09 12:04:55 -07:00
Jordan Liu
520be09949
Merge "Rename DEFAULT_CARD_INDEX" am: 038d1b5b27
...
am: 6802dbb6d5
2019-10-09 12:04:42 -07:00
Tobias Thierer
38c88d3f68
Merge "vendor.mime.types: Revert accidental modification." am: b6a549d916 am: f73856beb1
...
am: 49c327fc48
2019-10-09 12:02:41 -07:00
Hall Liu
8fd8b5b234
Merge "Fix race in TelephonyScanManager" am: 884dd0f559
...
am: 0c85ca1062
2019-10-09 12:01:23 -07:00
Paul Duffin
f7e1966d08
Merge "Allow incremental replacement of filegroups with stubs source"
...
am: 25843c7670
2019-10-09 11:56:54 -07:00
Tobias Thierer
49c327fc48
Merge "vendor.mime.types: Revert accidental modification." am: b6a549d916
...
am: f73856beb1
2019-10-09 11:56:22 -07:00
Ruchir Rastogi
21a287bae8
Refactor MetricActivation initialization
...
Specifically, MetricActivation state (mEventActivationMap and
mEventDeactivationMap) is now passed into the MetricProducer
constructor. This contrasts with the previous implementation in
which activations were accounted for after the MetricProducer
was constructed.
Additionally, the code to prepare the first bucket has been moved
into the constructor for gauge and value metrics. This last part
resulted in the modification of some tests.
Test: bit statsd_test:*
Test: atest CtsStatsdHostTestCases (no additional tests fail)
Bug: 131240626
Change-Id: I474ee8b1c51b187fbff4520deaf34b27e403bd14
2019-10-09 11:45:32 -07:00
Jordan Liu
6802dbb6d5
Merge "Rename DEFAULT_CARD_INDEX"
...
am: 038d1b5b27
2019-10-09 11:44:17 -07:00
Treehugger Robot
25843c7670
Merge "Allow incremental replacement of filegroups with stubs source"
2019-10-09 18:38:35 +00:00
Hall Liu
0c85ca1062
Merge "Fix race in TelephonyScanManager"
...
am: 884dd0f559
2019-10-09 11:36:41 -07:00
Tobias Thierer
f73856beb1
Merge "vendor.mime.types: Revert accidental modification."
...
am: b6a549d916
2019-10-09 11:32:22 -07:00
TreeHugger Robot
e0448e69a1
Merge "Turning on HDMI on Wake Up"
2019-10-09 18:32:08 +00:00
Treehugger Robot
038d1b5b27
Merge "Rename DEFAULT_CARD_INDEX"
2019-10-09 18:25:34 +00:00
Treehugger Robot
884dd0f559
Merge "Fix race in TelephonyScanManager"
2019-10-09 18:20:14 +00:00
TreeHugger Robot
683149c478
Merge "Add BitmapParams option to getFrameAtTime/getScaledFrameAtTime"
2019-10-09 18:17:26 +00:00
Khaled Abdelmohsen
c0fc9dd980
Merge "Represent OpenFormula as list of formulas"
2019-10-09 18:10:00 +00:00
Treehugger Robot
b6a549d916
Merge "vendor.mime.types: Revert accidental modification."
2019-10-09 18:05:24 +00:00
Andrii Kulian
6594be12c9
Merge "Simplify finishing flow for activities waiting for next one to resume"
2019-10-09 17:51:37 +00:00
Chris Tate
9d23418063
Merge "Move PackageManagerInternal to services.jar"
2019-10-09 17:51:10 +00:00
Makoto Onuki
d06da23f07
Tiny improvement on UserInfo.getUserHandle()
...
Test: boot / manual code inspection
Bug: 142134660
Change-Id: I49e25d4d2ac339365c08288b53a67ffba39e2405
2019-10-09 10:32:48 -07:00
Steven Moreland
3441faa045
Merge "Remove libhwbinder/libhidltransport deps"
2019-10-09 17:25:44 +00:00
Jordan Liu
72c39b6b5d
Merge "Fix comment for BIND_CELL_BROADCAST" am: a2f0d3dbce am: 4cc3966fe8 am: 02d8c13084
...
am: 087ddfcd50
2019-10-09 10:19:00 -07:00
Jordan Liu
087ddfcd50
Merge "Fix comment for BIND_CELL_BROADCAST" am: a2f0d3dbce am: 4cc3966fe8
...
am: 02d8c13084
2019-10-09 10:00:12 -07:00
Felipe Leme
daca37e5f0
(Minor) fix on ActivityManagerService.LocalService.getCurrentUserId()
...
Bug: 142130022
Test: manual verification with 'adb shell dumpsys user'
Change-Id: I3aa7d847e9595e7b28428ad839234c993f7d2485
2019-10-09 09:58:50 -07:00
Jordan Liu
51c0252220
[automerger skipped] Merge "Add CellBroadcastService and related permissions" am: 32382561a6 am: a2ca902d2f am: d208c955e5
...
am: cb0c6c90a9289dfd037f
2019-10-09 09:53:51 -07:00
Jordan Liu
02d8c13084
Merge "Fix comment for BIND_CELL_BROADCAST" am: a2f0d3dbce
...
am: 4cc3966fe8
2019-10-09 09:47:43 -07:00
Jordan Liu
cb0c6c90a9
Merge "Add CellBroadcastService and related permissions" am: 32382561a6 am: a2ca902d2f
...
am: d208c955e5
2019-10-09 09:43:10 -07:00
Tobias Thierer
362f1bd64b
Merge "Minimize default MIME map and optimize loading." am: d1bafa9ce1 am: 20615e9565 am: 72cb153d30
...
am: 2bf4ec75ab
2019-10-09 09:41:03 -07:00
