Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
559,004 Commits 3 Branches 0 Tags
fa5490f98f62cdecd1d6ed136d2e1585cc28ce3e
Commit Graph

559004 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benedict Wong
fa5490f98f Merge "Add NonNull annotation to getAllSubscriptionInfoList" am: e5e2388844 am: b655259440 am: 0c5a020adc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1485142

Change-Id: Iecf37cc98db520445607fdc20efbac0bf21e10e2
 2020-11-04 19:58:55 +00:00
Benedict Wong
0c5a020adc Merge "Add NonNull annotation to getAllSubscriptionInfoList" am: e5e2388844 am: b655259440 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1485142

Change-Id: Ic1e07d28a41eea2ce59cc21702dae95d61adc24e
 2020-11-04 19:40:31 +00:00
TreeHugger Robot
d23f4668be Merge "Ignore to show splash screen if the decorView is not opaque" into rvc-qpr-dev am: 4af61d89cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12935197

Change-Id: I20ef1932e88dbe70b77e23909d49a2bdf50e3651
 2020-11-04 19:11:20 +00:00
Benedict Wong
b655259440 Merge "Add NonNull annotation to getAllSubscriptionInfoList" am: e5e2388844 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1485142

Change-Id: I70f81584da85defea3d71d97c3a363af5b32f72d
 2020-11-04 19:06:42 +00:00
Bill Yi
f676899bc8 [automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 7ff2eff0fa -s ours am: 69b8dea355 -s ours 
am skip reason: Change-Id I921086d2b5b3a9a0a5b8d78109d28cccf6ff26fd with SHA-1 d947f25a20 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12984798

Change-Id: I59dfaa5577447890571cabce77fb2f47c4ee1c9e
 2020-11-04 19:06:19 +00:00
TreeHugger Robot
4af61d89cf Merge "Ignore to show splash screen if the decorView is not opaque" into rvc-qpr-dev 2020-11-04 18:51:05 +00:00
Benedict Wong
e5e2388844 Merge "Add NonNull annotation to getAllSubscriptionInfoList" 2020-11-04 18:40:53 +00:00
Benedict Wong
061b2f769d Add NonNull annotation to getAllSubscriptionInfoList 
This change marks getAllSubscriptionInfoList as NonNull; the method
already catches all exceptions, and returns an empty ArrayList if
something failed.

Test: atest FrameworksTelephonyTest
Change-Id: I7799d05f0f1f249fa5f4a47a3f4ff2c2691c75dc
 2020-11-04 18:40:41 +00:00
Bill Yi
69b8dea355 [automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 7ff2eff0fa -s ours 
am skip reason: Change-Id I921086d2b5b3a9a0a5b8d78109d28cccf6ff26fd with SHA-1 d947f25a20 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12984798

Change-Id: I6423f399eaf641113f9fd54511d5c90175de8ee7
 2020-11-04 18:34:32 +00:00
Bill Yi
7ff2eff0fa Merge "Merge rvc-release RP1A.201105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master 2020-11-04 18:18:23 +00:00
Brian Stack
8ea284f466 Merge "Remove erroneous logs in UWB RangingParamsTest" am: 04c894b6fa am: 07f2cba66d am: 0825a15ee4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487358

Change-Id: Ic319e81fac9560ca41c61c0948978811a3f9ebb4
 2020-11-04 17:53:03 +00:00
Jay Patel
a8b41af8e3 Merge "Call setArcStatus(false) before standby" am: b43dd5007f am: e7b7656f74 am: 9c27edec5f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313995

Change-Id: Iee8d8923cb793e2d008ebe36fec5f9049e3a4164
 2020-11-04 17:52:27 +00:00
Anton Hansson
0760665ae2 Merge "Dist merged jar instead of monolithic one" am: 7350b62384 am: e39d2d9f8c am: cd873a8792 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486197

Change-Id: Ifc487bbe6280beb35b16fb323b0e1cb6a246b314
 2020-11-04 17:51:57 +00:00
Brian Stack
0825a15ee4 Merge "Remove erroneous logs in UWB RangingParamsTest" am: 04c894b6fa am: 07f2cba66d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487358

Change-Id: Ic46dde29490024631f31f3a0d556c9d97487462b
 2020-11-04 17:39:35 +00:00
Jay Patel
9c27edec5f Merge "Call setArcStatus(false) before standby" am: b43dd5007f am: e7b7656f74 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313995

Change-Id: I272a4cc99f1ffc55e03484e94ced0f0692083a3a
 2020-11-04 17:39:21 +00:00
Anton Hansson
cd873a8792 Merge "Dist merged jar instead of monolithic one" am: 7350b62384 am: e39d2d9f8c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486197

Change-Id: I7c7dbb2f8d5f0c2d424a3dd70652700e9f6ae623
 2020-11-04 17:38:53 +00:00
Brian Stack
07f2cba66d Merge "Remove erroneous logs in UWB RangingParamsTest" am: 04c894b6fa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487358

Change-Id: Ia9186a13c6cbc6e7f156257ce6470ba6f95387e0
 2020-11-04 17:19:16 +00:00
Anton Hansson
7de3848dc3 Merge "Restrict visibility of framework-module-common-defaults" am: 1de077e8fd am: 01091d8fe1 am: 2c4d7fcc1b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1484099

Change-Id: Iaab5e01fd17824ff977fd14f35c66262abf41d96
 2020-11-04 17:13:16 +00:00
Jay Patel
e7b7656f74 Merge "Call setArcStatus(false) before standby" am: b43dd5007f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313995

Change-Id: I98a90788dfae899e2765841cd67fcad19a37aaf5
 2020-11-04 17:09:26 +00:00
Anton Hansson
e39d2d9f8c Merge "Dist merged jar instead of monolithic one" am: 7350b62384 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486197

Change-Id: Ib1f8c1d50a31021559bdee04115182a4d17f7006
 2020-11-04 17:06:05 +00:00
Anton Hansson
2c4d7fcc1b Merge "Restrict visibility of framework-module-common-defaults" am: 1de077e8fd am: 01091d8fe1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1484099

Change-Id: I45816986c8f05d2d67b5623162b6ce6a6c178059
 2020-11-04 17:02:59 +00:00
Anton Hansson
01091d8fe1 Merge "Restrict visibility of framework-module-common-defaults" am: 1de077e8fd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1484099

Change-Id: Ica7f1973bb843a64f471461208bae8e0ac69fae3
 2020-11-04 16:40:33 +00:00
Brian Stack
04c894b6fa Merge "Remove erroneous logs in UWB RangingParamsTest" 2020-11-04 16:38:36 +00:00
Jay Patel
b43dd5007f Merge "Call setArcStatus(false) before standby" 2020-11-04 16:26:27 +00:00
Anton Hansson
7350b62384 Merge "Dist merged jar instead of monolithic one" 2020-11-04 15:51:30 +00:00
Anton Hansson
1de077e8fd Merge "Restrict visibility of framework-module-common-defaults" 2020-11-04 15:49:55 +00:00
vichang
b295aad1bc Merge "Add app compat config from ICU4J" am: 6d5fbc8434 am: cf0dc89869 am: 334b0811ac 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1481306

Change-Id: I99cb4aaebaca625078d148f074867f5e9d0a5b98
 2020-11-04 13:00:39 +00:00
Eran Messeri
275329ba8e Merge "DO NOT MERGE: Introduce DPMS shim for active DO/PO check" am: 817969762e am: b0c59d4b6b am: b9ef876ca1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486196

Change-Id: I8498b1d2eff4e149c87e2546615e3fc33ab3c76f
 2020-11-04 13:00:22 +00:00
Eran Messeri
3b04027a04 DO NOT MERGE: Introduce DPMS shim for active DO/PO check am: bdd52cb48b am: 9e6305e3b0 am: fcebc45fb0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486196

Change-Id: I76bfbffc3485cd07675ffc8c8c64f11a8a7d5d03
 2020-11-04 13:00:13 +00:00
vichang
334b0811ac Merge "Add app compat config from ICU4J" am: 6d5fbc8434 am: cf0dc89869 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1481306

Change-Id: Ifd0f4808d1467b3cf54b21982afc521769536a33
 2020-11-04 12:46:56 +00:00
Eran Messeri
b9ef876ca1 Merge "DO NOT MERGE: Introduce DPMS shim for active DO/PO check" am: 817969762e am: b0c59d4b6b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486196

Change-Id: I427bd9d552a512b6cc2280ac6dc773d355b74cad
 2020-11-04 12:46:47 +00:00
Eran Messeri
fcebc45fb0 DO NOT MERGE: Introduce DPMS shim for active DO/PO check am: bdd52cb48b am: 9e6305e3b0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486196

Change-Id: I467120ce7e419a75749efac109609bb30cc35eff
 2020-11-04 12:46:45 +00:00
vichang
cf0dc89869 Merge "Add app compat config from ICU4J" am: 6d5fbc8434 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1481306

Change-Id: I155c8b08527e28efabef100c7105210b84ddbeec
 2020-11-04 12:32:26 +00:00
vichang
6d5fbc8434 Merge "Add app compat config from ICU4J" 2020-11-04 12:28:57 +00:00
Eran Messeri
b0c59d4b6b Merge "DO NOT MERGE: Introduce DPMS shim for active DO/PO check" am: 817969762e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486196

Change-Id: I01d19bd923e65dda0e939eb1a03102e505ce45f8
 2020-11-04 12:28:00 +00:00
Eran Messeri
9e6305e3b0 DO NOT MERGE: Introduce DPMS shim for active DO/PO check am: bdd52cb48b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486196

Change-Id: I79e090d92c5bf17993f8e4f710581675eb72f2a9
 2020-11-04 12:24:40 +00:00
Eran Messeri
817969762e Merge "DO NOT MERGE: Introduce DPMS shim for active DO/PO check" 2020-11-04 11:56:33 +00:00
daren.liao
ab378a865a Call setArcStatus(false) before standby 
[Description]
DisableDevice is called before standby.
If clearDeviceInfoList() is called before <Terminate ARC> is received,
CEC can't get device info & portId of AVR
And thus enableAudioReturnChannel is not success.

Therefore, we call setArcStatus(false) earlier
before RequestArcTerminationAction and receives <Terminate ARC>

Note that we don't use SetArcTransmissionStateAction since it is not
safe to create too many Actions during standby process

Bug: 137344668
Bug: 157184079

Change-Id: Ic67b31ce7d9b1dc0c3c578f87fdd782fcc797d3e
 2020-11-04 19:52:27 +09:00
Eran Messeri
bdd52cb48b DO NOT MERGE: Introduce DPMS shim for active DO/PO check 
Introduce a shim into DevicePolicyManagerInternal &
DevicePolicyManagerService so that NetworkStatsAccessTest would not
diverge from internal development branches.

The DevicePolicyManagerService refactoring on the internal branch
removed isActiveAdminWithPolicy in favour of isActiveDeviceOwner and
isActiveProfileOwner.

These methods are being made available in AOSP for
NetworkStatsAccessTest.

Bug: 170459325
Test: atest NetworkStatsAccessTest
Change-Id: Ic7e0898989fb8222aaba2b35436765c04eb3250c
 2020-11-04 10:07:06 +00:00
Allen Su
508f7d3f5b Merge "[IMS]Add bitrate and bandwidth into ImsStreamMediaProfile" am: 15075fcca0 am: e9fd3958f6 am: 3ce8089ecf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1478280

Change-Id: Icb4c73706da8322786c1884e2ca396bd8fd988e6
 2020-11-04 08:56:46 +00:00
Allen Su
3ce8089ecf Merge "[IMS]Add bitrate and bandwidth into ImsStreamMediaProfile" am: 15075fcca0 am: e9fd3958f6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1478280

Change-Id: I22c3a132c4511d1907ff846d75073369711d97f3
 2020-11-04 08:40:36 +00:00
Allen Su
e9fd3958f6 Merge "[IMS]Add bitrate and bandwidth into ImsStreamMediaProfile" am: 15075fcca0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1478280

Change-Id: I02a791584a66c1d1571046c5ab026423e2d3aadc
 2020-11-04 08:26:49 +00:00
Allen Su
15075fcca0 Merge "[IMS]Add bitrate and bandwidth into ImsStreamMediaProfile" 2020-11-04 07:53:42 +00:00
Bill Yi
5611c0299e Merge rvc-release RP1A.201105.002 to stage-aosp-master - DO NOT MERGE 
Merged-In: I921086d2b5b3a9a0a5b8d78109d28cccf6ff26fd
Change-Id: I5be609d7b7a0dc28486895c4ab772720eb7fe10a
 2020-11-03 22:27:18 -08:00
Automerger Merge Worker
7b8c2f0086 Merge "[automerger skipped] Merge "Introduce INPUT_CONSUMER permission for InputConsumer" into rvc-d1-dev am: c3347f92cd -s ours am: f4a788bee3 -s ours" into rvc-qpr-dev-plus-aosp 2020-11-04 05:53:22 +00:00
TreeHugger Robot
a50cc3b9a4 [automerger skipped] Merge "Introduce INPUT_CONSUMER permission for InputConsumer" into rvc-d1-dev am: c3347f92cd -s ours am: f4a788bee3 -s ours 
am skip reason: Change-Id I7a4c2c4cba7ea670873ab2ac49b9880d9a65cd86 with SHA-1 80951fa9a8 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12937360

Change-Id: I681e7c40f5e96aea00259fb3b7f61300ab913a66
 2020-11-04 05:53:16 +00:00
TreeHugger Robot
434fbe192b [automerger skipped] Merge "Introduce INPUT_CONSUMER permission for InputConsumer" into rvc-d1-dev am: c3347f92cd am: 82415c8b8b -s ours 
am skip reason: Change-Id I7a4c2c4cba7ea670873ab2ac49b9880d9a65cd86 with SHA-1 80951fa9a8 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12937360

Change-Id: I61447628f2066473009788f5c8b60400da13df1b
 2020-11-04 05:53:00 +00:00
TreeHugger Robot
82415c8b8b Merge "Introduce INPUT_CONSUMER permission for InputConsumer" into rvc-d1-dev am: c3347f92cd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12937360

Change-Id: I63a88a3b97c87490551535b58042cc210e998944
 2020-11-04 05:38:49 +00:00
TreeHugger Robot
f4a788bee3 [automerger skipped] Merge "Introduce INPUT_CONSUMER permission for InputConsumer" into rvc-d1-dev am: c3347f92cd -s ours 
am skip reason: Change-Id I7a4c2c4cba7ea670873ab2ac49b9880d9a65cd86 with SHA-1 80951fa9a8 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12937360

Change-Id: I99903a9323a71ba08ba097a6223a4faa0c8459ef
 2020-11-04 05:38:26 +00:00
TreeHugger Robot
c3347f92cd Merge "Introduce INPUT_CONSUMER permission for InputConsumer" into rvc-d1-dev 2020-11-04 05:21:36 +00:00