Commit Graph

737410 Commits

Author SHA1 Message Date
TreeHugger Robot
508fa90abe Merge "Re-add setMediaCas javadoc" 2021-12-23 13:02:16 +00:00
Lucas Lin
a49a2db95e [automerger skipped] Merge "Prevent an app to check if the specified VPN app is set VPN always-on" into sc-dev am: 34137fbbff -s ours am: a81742641d -s ours
am skip reason: Merged-In I0013039f58a6f7c5c73b9acc877d70a0126d0ca7 with SHA-1 e4049855c6 is already in history

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

Change-Id: I968aec3a51b2fdb6042d5104bfe814929d0a14de
2021-12-23 12:48:03 +00:00
Lucas Lin
a81742641d [automerger skipped] Merge "Prevent an app to check if the specified VPN app is set VPN always-on" into sc-dev am: 34137fbbff -s ours
am skip reason: Merged-In I0013039f58a6f7c5c73b9acc877d70a0126d0ca7 with SHA-1 e4049855c6 is already in history

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

Change-Id: Ifa73bdaf6530c89bd93729d2096ce0fb2c08ff28
2021-12-23 12:29:49 +00:00
Lucas Lin
34137fbbff Merge "Prevent an app to check if the specified VPN app is set VPN always-on" into sc-dev 2021-12-23 12:14:44 +00:00
Lucas Lin
35f5342aaf [automerger skipped] Merge "Prevent an app to check if the specified VPN app is set VPN always-on" into sc-mainline-prod am: 9c09f812c2 -s ours
am skip reason: Merged-In I0013039f58a6f7c5c73b9acc877d70a0126d0ca7 with SHA-1 d8ec51ac8b is already in history

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

Change-Id: Ic9829085b16d5bc17485613a259bb95f13900bc8
2021-12-23 11:33:06 +00:00
Lucas Lin
71d94bbaaf [automerger skipped] Merge "Prevent an app to check if the specified VPN app is set VPN always-on" into sc-v2-dev-plus-aosp am: 3f81ed26a6 -s ours
am skip reason: Merged-In I0013039f58a6f7c5c73b9acc877d70a0126d0ca7 with SHA-1 5d0e1e8bdf is already in history

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

Change-Id: I0bf32b7d667fe50ae6fa98d3e2eb5bdbdefca7fb
2021-12-23 11:25:53 +00:00
Lucas Lin
3f81ed26a6 Merge "Prevent an app to check if the specified VPN app is set VPN always-on" into sc-v2-dev-plus-aosp 2021-12-23 11:20:45 +00:00
Lucas Lin
9c09f812c2 Merge "Prevent an app to check if the specified VPN app is set VPN always-on" into sc-mainline-prod 2021-12-23 11:20:39 +00:00
Treehugger Robot
dba8baf7c9 Merge "am:fix format in OomAdjuster.md." am: ad9f190680 am: 66d6d1f7bd am: 91eceb90d2 am: 058372ed93
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1931580

Change-Id: I19401573b265221a7feeb51623953add7aa634bd
2021-12-23 11:19:50 +00:00
Treehugger Robot
058372ed93 Merge "am:fix format in OomAdjuster.md." am: ad9f190680 am: 66d6d1f7bd am: 91eceb90d2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1931580

Change-Id: I42fe07ce80906284e3d39a121878c7395a92b3a5
2021-12-23 11:07:44 +00:00
Treehugger Robot
91eceb90d2 Merge "am:fix format in OomAdjuster.md." am: ad9f190680 am: 66d6d1f7bd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1931580

Change-Id: I02cf0ad04e6411532d2be68a1da34cfdef810b40
2021-12-23 10:51:05 +00:00
Treehugger Robot
66d6d1f7bd Merge "am:fix format in OomAdjuster.md." am: ad9f190680
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1931580

Change-Id: Ie03ae7200ea7460665903047916fc8d504694bae
2021-12-23 10:40:02 +00:00
Treehugger Robot
ad9f190680 Merge "am:fix format in OomAdjuster.md." 2021-12-23 10:08:09 +00:00
TreeHugger Robot
17facee4f3 Merge "Add new features to tuner." 2021-12-23 08:04:13 +00:00
Betty Chang
53fa3cc3ef Merge "To add restriction check for Wi-Fi Tethering" 2021-12-23 07:58:47 +00:00
TreeHugger Robot
f435dbce67 [automerger skipped] Merge "Add ALLOW_SLIPPERY_TOUCHES permission" into sc-dev am: 5179b1de82 am: 34bf6a82d6 am: ad68e1ec34 -s ours am: ec3c613c29 -s ours
am skip reason: Merged-In I9ccdfd298f32c36b9c4da68c2e9c355c97dc7593 with SHA-1 b6071938fe is already in history

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

Change-Id: Ia42150202c3ac17ac13cd173461f60776f5491c2
2021-12-23 07:50:30 +00:00
TreeHugger Robot
ec3c613c29 [automerger skipped] Merge "Add ALLOW_SLIPPERY_TOUCHES permission" into sc-dev am: 5179b1de82 am: 34bf6a82d6 am: ad68e1ec34 -s ours
am skip reason: Merged-In I9ccdfd298f32c36b9c4da68c2e9c355c97dc7593 with SHA-1 b6071938fe is already in history

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

Change-Id: Ibd5a56c1df1da09011544a7f237616240f5ed601
2021-12-23 07:30:51 +00:00
Sergey Nikolaienkov
993030e598 Merge "Remove duplicated setCompanionAppUids() line in CdmService" 2021-12-23 07:30:19 +00:00
TreeHugger Robot
ad68e1ec34 Merge "Add ALLOW_SLIPPERY_TOUCHES permission" into sc-dev am: 5179b1de82 am: 34bf6a82d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16445550

Change-Id: Ifd374250323172c09142798c8a6c761921166ce0
2021-12-23 07:15:53 +00:00
TreeHugger Robot
7a8a2c4366 [automerger skipped] Merge "Add ALLOW_SLIPPERY_TOUCHES permission" into sc-dev am: 5179b1de82 am: 9d27f61b65 -s ours
am skip reason: Merged-In I9ccdfd298f32c36b9c4da68c2e9c355c97dc7593 with SHA-1 b6071938fe is already in history

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

Change-Id: I1376213ca4d2d8602fb208cde2651eea1728e6b9
2021-12-23 07:14:31 +00:00
TreeHugger Robot
9d27f61b65 Merge "Add ALLOW_SLIPPERY_TOUCHES permission" into sc-dev am: 5179b1de82
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16445550

Change-Id: I59032561dbbbc32fafaf5280b623604850f49700
2021-12-23 06:55:18 +00:00
TreeHugger Robot
34bf6a82d6 Merge "Add ALLOW_SLIPPERY_TOUCHES permission" into sc-dev am: 5179b1de82
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16445550

Change-Id: I0a324a3655f6f55e26d2f732cbfedeaeec154068
2021-12-23 06:55:10 +00:00
lucaslin
e4049855c6 Prevent an app to check if the specified VPN app is set VPN always-on
An app can check if the specified VPN app is set VPN always-on
or not by calling VpnManagerService#prepareVpn(). If it sets
oldPackage to null and newPackage to a specified VPN app which
is set always-on, then prepareVpn() will return true. So the app
could know the specified VPN app is installed and it's set
always-on.

Bug: 191276656
Test: atest FrameworksNetTests CtsNetTestCases \
      CtsHostsideNetworkTests:HostsideVpnTests
Change-Id: I0013039f58a6f7c5c73b9acc877d70a0126d0ca7
Merged-In: I0013039f58a6f7c5c73b9acc877d70a0126d0ca7
2021-12-23 06:54:36 +00:00
lucaslin
d8ec51ac8b Prevent an app to check if the specified VPN app is set VPN always-on
An app can check if the specified VPN app is set VPN always-on
or not by calling VpnManagerService#prepareVpn(). If it sets
oldPackage to null and newPackage to a specified VPN app which
is set always-on, then prepareVpn() will return true. So the app
could know the specified VPN app is installed and it's set
always-on.

Bug: 191276656
Test: atest FrameworksNetTests CtsNetTestCases \
      CtsHostsideNetworkTests:HostsideVpnTests
Change-Id: I0013039f58a6f7c5c73b9acc877d70a0126d0ca7
Merged-In: I0013039f58a6f7c5c73b9acc877d70a0126d0ca7
2021-12-23 06:53:07 +00:00
Shuo Qian
2f8a6b415e Merge "Use Math.floor to convert RSSNR from ten db to DB" am: 457bfa1180 am: bba215b2fe am: 3e9d13a1e0 am: 2e2494f1ea
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1910030

Change-Id: Ibf5f52b83bfbc00874aca17d3912e91b3e25ec25
2021-12-23 06:46:55 +00:00
TreeHugger Robot
5179b1de82 Merge "Add ALLOW_SLIPPERY_TOUCHES permission" into sc-dev 2021-12-23 06:40:10 +00:00
Shuo Qian
2e2494f1ea Merge "Use Math.floor to convert RSSNR from ten db to DB" am: 457bfa1180 am: bba215b2fe am: 3e9d13a1e0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1910030

Change-Id: Idab7cb7140ffe7297da288a56269d109c246f96a
2021-12-23 06:34:23 +00:00
Shuo Qian
3e9d13a1e0 Merge "Use Math.floor to convert RSSNR from ten db to DB" am: 457bfa1180 am: bba215b2fe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1910030

Change-Id: Ie736e9725f83f13effdf9826c13cf2be94afbb99
2021-12-23 06:18:02 +00:00
Shuo Qian
bba215b2fe Merge "Use Math.floor to convert RSSNR from ten db to DB" am: 457bfa1180
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1910030

Change-Id: Idfee071f3f9dfc80cc30560e4dab9f2da14ed6cb
2021-12-23 05:59:42 +00:00
Shuo Qian
457bfa1180 Merge "Use Math.floor to convert RSSNR from ten db to DB" 2021-12-23 05:45:35 +00:00
Hongguang
38904f8b24 Add new features to tuner.
*) Support scan unlock event
*) Support get frontend hardware info.
*) Add scIndexMask to MediaEvent.
*) Support more AAC formats.
*) Move Lna to ITuner.

Bug: 203389496
Bug: 184017033
Bug: 202978951
Bug: 205265630
Bug: 203623028
Test: atest android.media.tv.tuner.cts on AIDL and HILD HALs.
Change-Id: Id1bf4f13e7afb5f4264bfc67ca7d822848c6e803
2021-12-23 04:41:39 +00:00
TreeHugger Robot
3253206523 Merge "Fix null pointer exception during initialization" 2021-12-23 04:00:10 +00:00
Junyu Lai
e30047b059 Merge "[MS15.1] Remove get/setSubscriberIdMatchRule dependencies" am: d159c1ead7 am: d0c50a49e0 am: 157b8f7a3a am: 5dddce9aa2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1926944

Change-Id: I3fc3b45ac97b1f3a60cba1f2700fe7dcd73ad43b
2021-12-23 02:17:58 +00:00
Junyu Lai
5dddce9aa2 Merge "[MS15.1] Remove get/setSubscriberIdMatchRule dependencies" am: d159c1ead7 am: d0c50a49e0 am: 157b8f7a3a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1926944

Change-Id: Ifc1ed3a7d0e100dbd567c6809a07a8a38012ed60
2021-12-23 02:17:03 +00:00
James Mattis
a170912070 Merge changes from topic "railway_stub" am: 9ff27e5802 am: 8a24cce6d2 am: 0b5a0881f3 am: 11a5ed05ef
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1923578

Change-Id: Ibfca187222fca09418668466c3e1b0c19b4d47d4
2021-12-23 02:05:09 +00:00
Calvin Pan
55f8b4d30c Merge "Rename TextAttributeBuilder" 2021-12-23 02:03:54 +00:00
Junyu Lai
157b8f7a3a Merge "[MS15.1] Remove get/setSubscriberIdMatchRule dependencies" am: d159c1ead7 am: d0c50a49e0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1926944

Change-Id: I6336d13c19ad2e7089e68ba30b1da38df957a35d
2021-12-23 02:00:10 +00:00
James Mattis
11a5ed05ef Merge changes from topic "railway_stub" am: 9ff27e5802 am: 8a24cce6d2 am: 0b5a0881f3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1923578

Change-Id: I2e549190dac06a9325ad0c8c5e53c4c8c0e3169e
2021-12-23 01:54:13 +00:00
Junyu Lai
d0c50a49e0 Merge "[MS15.1] Remove get/setSubscriberIdMatchRule dependencies" am: d159c1ead7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1926944

Change-Id: Id10207685a3a4f815cf3be9233af051ac090c0ba
2021-12-23 01:50:11 +00:00
TreeHugger Robot
28049a6dc2 Merge "Create new DataEnabledReasons for for DataSettingsManager" 2021-12-23 01:44:13 +00:00
James Mattis
0b5a0881f3 Merge changes from topic "railway_stub" am: 9ff27e5802 am: 8a24cce6d2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1923578

Change-Id: I8d952cc1c470e1347e3b8ae2984cb3ce44a1b4c9
2021-12-23 01:41:40 +00:00
Junyu Lai
d159c1ead7 Merge "[MS15.1] Remove get/setSubscriberIdMatchRule dependencies" 2021-12-23 01:35:00 +00:00
James Mattis
8a24cce6d2 Merge changes from topic "railway_stub" am: 9ff27e5802
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1923578

Change-Id: I67b78f551bc24d3fda6f8c55dca618ee62808906
2021-12-23 01:24:25 +00:00
James Mattis
9ff27e5802 Merge changes from topic "railway_stub"
* changes:
  eth manager updates for network management APIs
  aidl and Parcelable defintions for eth management
2021-12-23 00:59:06 +00:00
Yurii Zubrytskyi
35e226b0e7 Fix null pointer exception during initialization
PackageManagerService ctor calls
InitAndSystemPackageHelper.initPackages() to create the
OverlayConfig object, but this object is needed inside the
initPackages() call, when parsing an updated system overlay
in ScanPackageHelper.assertPackageIsValid() -> isOverlayMutable

This change uses the OverlayConfig's singleton accessor as a
backup when the member isn't set

Bug: 211469178
Test: install APK from the bug, reboot - no crashloop
Change-Id: I0d2b2fc1317db963980dbd1ca84dc61d2bfec5f5
2021-12-22 16:26:39 -08:00
Arc Wang
7b82095160 Merge "Fix Arabic floating point number display problem" 2021-12-23 00:03:32 +00:00
Jack Yu
e90bb5f637 Merge "Added IWLAN handover support" 2021-12-22 23:11:17 +00:00
Henry Fang
58cc75249a Merge "Add methods to get vendor extension interfaces" am: 1d6f1c9d04 am: 8ed7a545a7 am: bd75d74c59 am: 39dbf1ac0c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1826093

Change-Id: Icfeb8b0a1cddf488979b44fe726e9e68ddf03406
2021-12-22 23:02:37 +00:00
Devin Moore
04ed1281c9 Merge "Use new AIDL IR interface for ConsumerIr service" am: a188a10262 am: 26af7dd375 am: 8522a80d4c am: 75b58f4d71
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1887097

Change-Id: I8f9abc63affe76f6438bff0d2c7fbb3d402ba76a
2021-12-22 22:52:57 +00:00
Henry Fang
39dbf1ac0c Merge "Add methods to get vendor extension interfaces" am: 1d6f1c9d04 am: 8ed7a545a7 am: bd75d74c59
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1826093

Change-Id: Id5afa9a3006a1f10228d1842892d317e0b93dac8
2021-12-22 22:50:14 +00:00