Fabian Kozynski
2fa208d98a
Merge "Universal Broadcast Receiver for SystemUI"
2019-08-14 20:11:32 +00:00
Roshan Pius
07820f85ac
Merge changes from topic "wifi_mainline_apk_separation"
...
* changes:
Sysui/WifiTracker: Changes to support late starting wifi service
WifiManager: Retrieve IWifiManager service lazily
WifiStackClient: Register wifi API services from system_server
Mainline wifi stack module
NetworkStackClient: Refactor network stack process interaction
2019-08-14 19:33:10 +00:00
TreeHugger Robot
f6ac4bfc54
Merge "Fix locking issue by short-circuiting feature"
2019-08-14 19:12:24 +00:00
Wale Ogunwale
b7e133be72
Merge "Revert "Don't start intelligence services that are not provided by the OEM.""
2019-08-14 16:03:19 +00:00
Adrian Roos
3c0ec9ef98
Merge "API: Explicitly track incompatibilities with previous API versions" am: 5f76164a65 am: 5f00bf12f4 am: 285725f7b0 am: f0c2d88a24
...
am: f6ba471a99
2019-08-14 08:52:31 -07:00
Adrian Roos
f6ba471a99
Merge "API: Explicitly track incompatibilities with previous API versions" am: 5f76164a65 am: 5f00bf12f4 am: 285725f7b0
...
am: f0c2d88a24
2019-08-14 08:38:25 -07:00
Adrian Roos
f0c2d88a24
Merge "API: Explicitly track incompatibilities with previous API versions" am: 5f76164a65 am: 5f00bf12f4
...
am: 285725f7b0
2019-08-14 08:26:54 -07:00
Patrick Baumann
4e47d16509
Fix locking issue by short-circuiting feature
...
This is a temporary fix to avoid holding the PackageManagerService.mLock
while querying the DeviceConfig provider, which then attempts to acquire
the same lock. A subsequent CL will provide a correct and longer term
fix.
Fixes: 139348423
Test: atest AppsFilterTest
Change-Id: I4422fbb51d23e276c26cc9d8ba48783e7c5e53ff
2019-08-14 08:20:08 -07:00
Adrian Roos
285725f7b0
Merge "API: Explicitly track incompatibilities with previous API versions" am: 5f76164a65
...
am: 5f00bf12f4
2019-08-14 08:18:14 -07:00
Adrian Roos
5f00bf12f4
Merge "API: Explicitly track incompatibilities with previous API versions"
...
am: 5f76164a65
2019-08-14 08:11:37 -07:00
Adrian Roos
5f76164a65
Merge "API: Explicitly track incompatibilities with previous API versions"
2019-08-14 14:39:18 +00:00
TreeHugger Robot
5cc1472d82
Merge "Metadata: recycle Parcel"
2019-08-14 14:27:39 +00:00
Fedor Kudasov
426ba4d5ce
Merge "Add hostgraphics classes required for ImageReader"
2019-08-14 14:17:54 +00:00
Leon Scroggins
d6d443229f
Merge "NDK: Report RGBA_F16 as appropriate"
2019-08-14 13:38:23 +00:00
Wale Ogunwale
b897b173c1
Revert "Don't start intelligence services that are not provided by the OEM."
...
This reverts commit c6fff2524b
2019-08-14 13:04:40 +00:00
Chiachang Wang
5be260e609
Merge "Get resource based on subId for multi-SIM" am: 55752cf8d4 am: 2afb11fbc8 am: 2b7f2fbb5b am: 5e994ea02c
...
am: 953f3a62ce
2019-08-14 05:21:30 -07:00
Chiachang Wang
953f3a62ce
Merge "Get resource based on subId for multi-SIM" am: 55752cf8d4 am: 2afb11fbc8 am: 2b7f2fbb5b
...
am: 5e994ea02c
2019-08-14 05:08:41 -07:00
Chiachang Wang
5e994ea02c
Merge "Get resource based on subId for multi-SIM" am: 55752cf8d4 am: 2afb11fbc8
...
am: 2b7f2fbb5b
2019-08-14 04:54:59 -07:00
Chiachang Wang
2b7f2fbb5b
Merge "Get resource based on subId for multi-SIM" am: 55752cf8d4
...
am: 2afb11fbc8
2019-08-14 04:39:23 -07:00
Chiachang Wang
2afb11fbc8
Merge "Get resource based on subId for multi-SIM"
...
am: 55752cf8d4
2019-08-14 04:30:57 -07:00
Chiachang Wang
55752cf8d4
Merge "Get resource based on subId for multi-SIM"
2019-08-14 10:56:27 +00:00
Prabir Pradhan
ec10be38f5
Merge "Merge "apply empty transaction in startActivitySync" into qt-dev am: f928b661d9 am: d8006ca972" into qt-r1-dev-plus-aosp am: a761c84624
...
am: 7c98a017e5
2019-08-14 02:22:17 -07:00
Prabir Pradhan
326a094f43
Merge "Merge "apply empty transaction in startActivitySync" into qt-dev am: f928b661d9 am: 5cd874d792 am: 5d138b1d12" into qt-qpr1-dev-plus-aosp
...
am: 17bcc8bc4b
2019-08-14 02:18:52 -07:00
Prabir Pradhan
e83475885e
Merge "apply empty transaction in startActivitySync" into qt-dev am: f928b661d9 am: 5cd874d792 am: fa6f50e13d
...
am: a47f176420
2019-08-14 02:14:15 -07:00
Prabir Pradhan
7c98a017e5
Merge "Merge "apply empty transaction in startActivitySync" into qt-dev am: f928b661d9 am: d8006ca972" into qt-r1-dev-plus-aosp
...
am: a761c84624
2019-08-14 02:06:25 -07:00
Android Build Merger (Role)
17bcc8bc4b
Merge "Merge "apply empty transaction in startActivitySync" into qt-dev am: f928b661d9 am: 5cd874d792 am: 5d138b1d12" into qt-qpr1-dev-plus-aosp
2019-08-14 09:01:03 +00:00
Prabir Pradhan
fd79695947
Merge "apply empty transaction in startActivitySync" into qt-dev am: f928b661d9 am: 5cd874d792
...
am: 5d138b1d12
2019-08-14 02:00:38 -07:00
Prabir Pradhan
a47f176420
Merge "apply empty transaction in startActivitySync" into qt-dev am: f928b661d9 am: 5cd874d792
...
am: fa6f50e13d
2019-08-14 02:00:18 -07:00
Android Build Merger (Role)
a761c84624
Merge "Merge "apply empty transaction in startActivitySync" into qt-dev am: f928b661d9 am: d8006ca972" into qt-r1-dev-plus-aosp
2019-08-14 08:53:56 +00:00
Prabir Pradhan
5bf60055d4
Merge "apply empty transaction in startActivitySync" into qt-dev am: f928b661d9
...
am: d8006ca972
2019-08-14 01:53:30 -07:00
Prabir Pradhan
5d138b1d12
Merge "apply empty transaction in startActivitySync" into qt-dev am: f928b661d9
...
am: 5cd874d792
2019-08-14 01:53:22 -07:00
Prabir Pradhan
fa6f50e13d
Merge "apply empty transaction in startActivitySync" into qt-dev am: f928b661d9
...
am: 5cd874d792
2019-08-14 01:53:13 -07:00
Prabir Pradhan
5cd874d792
Merge "apply empty transaction in startActivitySync" into qt-dev
...
am: f928b661d9
2019-08-14 01:40:41 -07:00
Prabir Pradhan
d8006ca972
Merge "apply empty transaction in startActivitySync" into qt-dev
...
am: f928b661d9
2019-08-14 01:39:18 -07:00
TreeHugger Robot
f928b661d9
Merge "apply empty transaction in startActivitySync" into qt-dev
2019-08-14 06:42:05 +00:00
TreeHugger Robot
53e988c4ad
Merge "GraphicsStatService: fix double close."
2019-08-14 06:32:54 +00:00
Chiachang Wang
5f8ac27d79
Get resource based on subId for multi-SIM
...
The resource loading is done based on the last SIM to come up
which is not a deterministic design. Thus, update the way to get
the resource based on the subId.
Test: atest FrameworksNetTests
Test: manually test with avoid bad wifi feature supported sim
Bug: 138956509
Change-Id: Ib5b085d97103889600773d269e03b939c29ca47d
2019-08-14 13:56:37 +08:00
Wei Wang
4c1bbeacd3
Merge "ThermalService: add event log when temperature changed" into qt-qpr1-dev am: a046613c02
...
am: cfecc72b28
2019-08-13 21:22:00 -07:00
Wei Wang
cfecc72b28
Merge "ThermalService: add event log when temperature changed" into qt-qpr1-dev
...
am: a046613c02
2019-08-13 20:58:27 -07:00
Wei Wang
a046613c02
Merge "ThermalService: add event log when temperature changed" into qt-qpr1-dev
2019-08-14 03:41:44 +00:00
TreeHugger Robot
620c61dc8a
Merge "Initial implementation of system service optimizations for different type of users."
2019-08-14 00:52:24 +00:00
Brad Ebinger
736e4cebe3
Merge "Modify RCS UCE APIs to use AIDL Interfaces." am: 4204a6017e am: c64c204f59 am: 7e3661be1e am: a33d1aed85
...
am: ce95274ae6
2019-08-13 17:45:57 -07:00
Brad Ebinger
ce95274ae6
Merge "Modify RCS UCE APIs to use AIDL Interfaces." am: 4204a6017e am: c64c204f59 am: 7e3661be1e
...
am: a33d1aed85
2019-08-13 17:32:54 -07:00
Lucas Dupin
467b6f9755
[automerger skipped] Merge "Fix double auth issue" into qt-qpr1-dev am: 07d866a10e
...
am: a035bd1356737b851893
2019-08-13 17:22:04 -07:00
Brad Ebinger
a33d1aed85
Merge "Modify RCS UCE APIs to use AIDL Interfaces." am: 4204a6017e am: c64c204f59
...
am: 7e3661be1e
2019-08-13 17:21:23 -07:00
Lucas Dupin
a035bd1356
Merge "Fix double auth issue" into qt-qpr1-dev
...
am: 07d866a10e
2019-08-13 16:53:02 -07:00
Brad Ebinger
7e3661be1e
Merge "Modify RCS UCE APIs to use AIDL Interfaces." am: 4204a6017e
...
am: c64c204f59
2019-08-13 16:51:51 -07:00
Brad Ebinger
c64c204f59
Merge "Modify RCS UCE APIs to use AIDL Interfaces."
...
am: 4204a6017e
2019-08-13 16:34:41 -07:00
Wei Jia
e5a12e0ddb
Metadata: recycle Parcel
...
Test: cts
Bug: 139319531
Change-Id: Ica1a7333fc15869b16b55669c3ba001187670eb7
2019-08-13 16:23:35 -07:00
TreeHugger Robot
83277a9328
Merge "Documented why am.systemReady() only sends user broadcasts for system user."
2019-08-13 23:11:58 +00:00
