Commit Graph

571420 Commits

Author SHA1 Message Date
Treehugger Robot
3c3fcf6865 Merge "Scale stack dump timeout with HW_TIMEOUT_MULTIPLIER." am: cf89aac24b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1768622

Change-Id: Ibcb6a9fa366129d807d7a8662f26cc5427893720
2021-07-20 18:14:52 +00:00
Treehugger Robot
e2d2a4be1f Merge changes I31ddbed9,I702a2449 am: a730b44c86
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1489240

Change-Id: I490ac9074ecbf513b111108a8835e700d03af1fb
2021-07-20 18:14:19 +00:00
Venkatarama NG. Avadhani
c6204b79fb HDMICEC: Add equals test for DeviceConfig am: 555aa8a7fd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1489239

Change-Id: I4aceffebbeface4723bcb5409063053740c0fdce
2021-07-20 18:14:16 +00:00
Treehugger Robot
cf89aac24b Merge "Scale stack dump timeout with HW_TIMEOUT_MULTIPLIER." 2021-07-20 17:26:03 +00:00
Treehugger Robot
a730b44c86 Merge changes I31ddbed9,I702a2449
* changes:
  HDMICEC: Add equals test for HdmiCecMessage
  HDMICEC: Add equals test for DeviceConfig
2021-07-20 16:55:49 +00:00
Venkatarama NG. Avadhani
161e9b74a1 HDMICEC: Add equals test for HdmiCecMessage
Bug: 168713324
Test: atest HdmiCecMessageTest#testEqualsHdmiCecMessage
Change-Id: I31ddbed919ccf7a52824a0252c8d1db35bb6ebd9
Merged-In: I31ddbed919ccf7a52824a0252c8d1db35bb6ebd9
2021-07-20 15:10:27 +00:00
Treehugger Robot
b0710bceb4 Merge "Update SELinuxMMAC OWNERS" am: cdfdcdadbd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1760351

Change-Id: I2aebcc1348e06ae2e856f88cf2855b2ff9522037
2021-07-20 13:09:18 +00:00
Treehugger Robot
cdfdcdadbd Merge "Update SELinuxMMAC OWNERS" 2021-07-20 12:54:09 +00:00
Treehugger Robot
d4909b9aa9 Merge "Gracefully handle integer overflows." am: edbf08efe4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1714119

Change-Id: Ie9e65036aed6448183c45c0c526976474b5555ab
2021-07-20 07:59:01 +00:00
Treehugger Robot
edbf08efe4 Merge "Gracefully handle integer overflows." 2021-07-20 07:36:56 +00:00
Rambo Wang
3d97b23aa1 Merge "Clear binder identity in callback of IMS IPC interfaces" am: 67e10842b2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1771685

Change-Id: I80edbe7adc7d6b4eae5ba77e05656f130888d0dc
2021-07-20 00:31:49 +00:00
Rambo Wang
67e10842b2 Merge "Clear binder identity in callback of IMS IPC interfaces" 2021-07-20 00:18:40 +00:00
Rambo Wang
c18002c465 Clear binder identity in callback of IMS IPC interfaces
The binder identity does get cleared when goes from client process
into phone process. When it comes back from phone to client, the
binder identity should also be cleared.

Bug: 193923945
Test: atest android.telephony.cts.TelephonyManagerTest
Test: atest ImsServiceTest RcsFeatureControllerTest ImsMmTelManagerTest
Change-Id: I34225e32111879e155c9f7865f0045430d171467
2021-07-19 12:27:38 -07:00
Phil Weaver
c4b00b8f57 Merge "Fix "already registered" error" am: 0df5bbfe90
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1751360

Change-Id: I968842b29cbc5dfbcc9b904291dd9a0e67cf8606
2021-07-19 17:45:46 +00:00
Phil Weaver
0df5bbfe90 Merge "Fix "already registered" error" 2021-07-19 17:18:14 +00:00
Treehugger Robot
4c22f15543 Merge "Added Ble scan APIs to BatteryStatsManager" am: 54c9ff981e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1750141

Change-Id: I9fc31acd57e674d4fa8abfc2c038bf2cb744178d
2021-07-19 15:45:39 +00:00
Treehugger Robot
54c9ff981e Merge "Added Ble scan APIs to BatteryStatsManager" 2021-07-19 15:32:41 +00:00
Remi NGUYEN VAN
8565e71426 Merge "Rename FIRST_SDK_INT to DEVICE_INITIAL_SDK_INT" am: 8608d0626e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1686171

Change-Id: I13655def2a6e5913031814490106296bc609959f
2021-07-19 10:08:40 +00:00
Remi NGUYEN VAN
8608d0626e Merge "Rename FIRST_SDK_INT to DEVICE_INITIAL_SDK_INT" 2021-07-19 09:47:21 +00:00
Paul Duffin
0c671e5cd6 Merge "Move media related hidden API flag file entries to frameworks/av" am: 7094e821ca
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1769685

Change-Id: I84e9f387d66896a4f4bf6af2303dfb60d8aa15cc
2021-07-17 11:45:52 +00:00
Paul Duffin
4eba0fef28 Merge "Move wifi related hidden API flag file entries to packages/modules/Wifi" am: 077513c4b5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1768370

Change-Id: I41d3805413f26233d1475961240defc8d36ef028
2021-07-17 11:42:36 +00:00
Paul Duffin
e02115712f Merge "Move media provider related hidden API flag file entries to packages/providers/MediaProvider" am: 0a0f645011
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1769686

Change-Id: I9d94d36dc04b7e83a48e31b9dd92fa84e94cb2ea
2021-07-17 11:39:52 +00:00
Paul Duffin
7094e821ca Merge "Move media related hidden API flag file entries to frameworks/av" 2021-07-17 11:25:27 +00:00
Paul Duffin
077513c4b5 Merge "Move wifi related hidden API flag file entries to packages/modules/Wifi" 2021-07-17 11:25:23 +00:00
Paul Duffin
0a0f645011 Merge "Move media provider related hidden API flag file entries to packages/providers/MediaProvider" 2021-07-17 11:25:04 +00:00
Rambo Wang
2e7d4fe98b Merge "Support platform-compat-framework for TeleService" am: 7ad8aa929e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1747977

Change-Id: Ie42eb0ffc8d911249c59f83581f7a4060c1c2653
2021-07-16 22:01:20 +00:00
Benedict Wong
e98f254f96 Merge "Ensure VcnGatewayConnection#isQuitting never gets unset after being set" am: fc9e0c982f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1768623

Change-Id: I867279a00129a89fa1efaf09878ed04f3f9936d7
2021-07-16 22:00:37 +00:00
Treehugger Robot
a92fac686c Merge "Restrict all jobs when the device is too hot." am: 5a750a5aa1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1766505

Change-Id: Ifa4a464064ac71b26372a2afe760912c22431e76
2021-07-16 22:00:01 +00:00
Yabin Cui
951a22e80e Merge "idmap2: fix for compiler update." am: 0cb190e889
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1768613

Change-Id: I5a8c33c5c6c233663da241f390717c71881cf16d
2021-07-16 21:58:06 +00:00
Rambo Wang
7ad8aa929e Merge "Support platform-compat-framework for TeleService" 2021-07-16 21:39:21 +00:00
Benedict Wong
fc9e0c982f Merge "Ensure VcnGatewayConnection#isQuitting never gets unset after being set" 2021-07-16 21:29:36 +00:00
Treehugger Robot
5a750a5aa1 Merge "Restrict all jobs when the device is too hot." 2021-07-16 21:25:54 +00:00
Yabin Cui
0cb190e889 Merge "idmap2: fix for compiler update." 2021-07-16 20:33:46 +00:00
Benedict Wong
e8c548fd02 Ensure VcnGatewayConnection#isQuitting never gets unset after being set
This change ensures that the VcnGatewayConnection can never abort a
quitting command; specifically, if a non-quitting disconnect request is
processed after a quitting disconnect request, the isQuitting value MUST
continue to stay set (as true).

Failure to OR the values results in orphaned VcnGatewayConnection(s),
and the VCN network thrashing.

Additionally reduce verbosity of local logs, to ensure it better
captures failures and logWtf(s)

Bug: 192776413
Test: atest FrameworksVcnTests
Change-Id: Iec8dae701838794261957609bae4e270eaa9cdc7
2021-07-16 12:10:08 -07:00
Yifan Hong
ca676985ad Merge "AndroidRuntime: Expose GetJavaVM" am: baba1f7d96
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1767690

Change-Id: I009d9510392a7b1a540ea36503845f98d264bd17
2021-07-16 17:03:20 +00:00
Yifan Hong
baba1f7d96 Merge "AndroidRuntime: Expose GetJavaVM" 2021-07-16 16:58:19 +00:00
Suren Baghdasaryan
326599cf76 Merge "ActivityManagerService: add new lmkd kill reason" am: aebf935349
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1768611

Change-Id: Ib21eab16a57fd7b43435c7b005fe64d6903f5473
2021-07-16 16:39:34 +00:00
Suren Baghdasaryan
aebf935349 Merge "ActivityManagerService: add new lmkd kill reason" 2021-07-16 16:23:23 +00:00
Paul Duffin
656b0133a3 Move media provider related hidden API flag file entries to packages/providers/MediaProvider
Bug: 179354495
Test: m com.android.mediaprovider
      - ensure that the generated APEX is byte-for-byte identical
        before and after these changes.
      m out/soong/hiddenapi/hiddenapi-flags.csv
      - make sure that they are not changed by this.
Merged-In: I0615b68715de2bb953da27b60d29d37b2750d86b
Change-Id: I0615b68715de2bb953da27b60d29d37b2750d86b
(cherry picked from commit dd7640795c)
2021-07-16 16:15:05 +01:00
Paul Duffin
1ed45f954a Move media related hidden API flag file entries to frameworks/av
Bug: 179354495
Test: m com.android.media
      - ensure that the generated APEX is byte-for-byte identical
        before and after these changes.
      m out/soong/hiddenapi/hiddenapi-flags.csv
      - make sure that they are not changed by this.
Merged-In: I0dea4284723835c0592ce9aaf7382e344ae959f7
Change-Id: I0dea4284723835c0592ce9aaf7382e344ae959f7
(cherry picked from commit 5283c3cf68)
2021-07-16 15:49:11 +01:00
Paul Duffin
dcc1f9b862 Move wifi related hidden API flag file entries to packages/modules/Wifi
Bug: 179354495
Test: m com.android.wifi
      - ensure that the generated APEX is byte-for-byte identical
        before and after these changes.
      m out/soong/hiddenapi/hiddenapi-flags.csv
      - make sure that they are not changed by this.
Merged-In: I45f46f9aebb90ca9ff0a60c37068b94238354578
Change-Id: I45f46f9aebb90ca9ff0a60c37068b94238354578
(cherry picked from commit ecd5356f9a)
2021-07-16 15:30:12 +01:00
Treehugger Robot
f2ba048e8a Merge "HDMICEC: Add equals test for CodecSad" am: 2c677b190d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1489238

Change-Id: I34ab813644a4f40e36218b0574091bd6d19dd893
2021-07-16 14:19:06 +00:00
Treehugger Robot
2c677b190d Merge "HDMICEC: Add equals test for CodecSad" 2021-07-16 14:03:32 +00:00
Kalesh Singh
b5e1145b17 Merge "Add API to get GPU private memory" am: e84ebfc0fc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1764047

Change-Id: Id2f283abf8cb2c06b1aaec7ee7723e063f03ee5f
2021-07-16 13:09:37 +00:00
Kalesh Singh
e84ebfc0fc Merge "Add API to get GPU private memory" 2021-07-16 12:57:49 +00:00
Venkatarama NG. Avadhani
555aa8a7fd HDMICEC: Add equals test for DeviceConfig
Add equals test for nested class class DeviceConfig in HdmiUtils.

Bug: 168713324
Test: atest HdmiUtilsTest#testEqualsDeviceConfig
Change-Id: I702a24494ef28752bb764e0843b969ae3b45b6f4
Merged-In: I702a24494ef28752bb764e0843b969ae3b45b6f4
2021-07-16 12:39:41 +00:00
Venkatarama NG. Avadhani
981814f10c HDMICEC: Add equals test for CodecSad
Add equals test for nested class class CodecSad in HdmiUtils.

Bug: 168713324
Test: atest HdmiUtilsTest#testEqualsCodecSad
Change-Id: I5991629458ef06d9feaabec55f85c0f88368b301
Merged-In: I5991629458ef06d9feaabec55f85c0f88368b301
2021-07-16 12:39:18 +00:00
Treehugger Robot
cb477fc498 Merge "Add a lock for call add/remove operations to avoid ConcurrentModificationException." am: 584003dd0d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1768612

Change-Id: I189d728ae8f385f82bb66d244dac37f02f2edf42
2021-07-16 12:20:49 +00:00
Treehugger Robot
584003dd0d Merge "Add a lock for call add/remove operations to avoid ConcurrentModificationException." 2021-07-16 12:05:52 +00:00
Benedict Wong
4d16027790 Merge "Limit VCNs to one running at a given time" am: 9e6e3ce643
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1767050

Change-Id: I4add4dc57ac3c49ebd66da460dd42f54f880d079
2021-07-16 03:05:30 +00:00