Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
639,441 Commits 3 Branches 0 Tags
7d69c15b01774fce549ec7ca52b89cfba5af04de
Commit Graph

14953 Commits

Author SHA1 Message Date
Sarah Chin
18c7a59a58 Merge "Update carrier privilege check in enforceSubscriptionPlanAccess" into rvc-qpr-dev am: 5ccc5d56fb am: a1d5fb4c7b am: 074859a776 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13676219

Change-Id: I03dec9e6c0f9e4bed0de2d99a515bdb0609d1349
 2021-04-02 20:30:05 +00:00
Sarah Chin
074859a776 Merge "Update carrier privilege check in enforceSubscriptionPlanAccess" into rvc-qpr-dev am: 5ccc5d56fb am: a1d5fb4c7b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13676219

Change-Id: I3373614dc55d6531be0411289787fe501753b1cf
 2021-04-02 20:09:12 +00:00
Sarah Chin
a1d5fb4c7b Merge "Update carrier privilege check in enforceSubscriptionPlanAccess" into rvc-qpr-dev am: 5ccc5d56fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13676219

Change-Id: Iaa38b99c82bc54e6e8b7a93e24c800281fc53905
 2021-04-02 19:25:23 +00:00
Sarah Chin
4420bffbed Merge "DCT set up default before enterprise APN" into sc-dev am: c680b0950d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14047619

Change-Id: I866cc7ed080501af9b3145def2b0e691abc03995
 2021-04-02 05:48:45 +00:00
Sarah Chin
c680b0950d Merge "DCT set up default before enterprise APN" into sc-dev 2021-04-02 05:13:25 +00:00
Sarah Chin
172f15e5e1 Update carrier privilege check in enforceSubscriptionPlanAccess 
Remove isEmbedded() check, since this can be called on both PSIM and
ESIM. Replace SM#canManageSubscription with TM#hasCarrierPrivileges,
since it is a superset of the checks done in SM#canManageSubscription
and applies to both PSIMs as well as ESIMS. Updated the documentation
for the two APIs to clarify the differences.

Test: atest CtsTelephonyTestCases (SubscriptionManagerTest)
Fix: 180451446
Change-Id: Icb4e2c619dacaea9e74cedea31865ec1eb689dce
 2021-04-01 16:55:50 -07:00
Treehugger Robot
527da75a4c Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: 7226ad3729 am: a087245e03 am: 3dd40d172b am: 9864e155a8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661581

Change-Id: Ic621a484909047fa86a94729ae4ea9307f4175da
 2021-04-01 14:21:27 +00:00
Treehugger Robot
9864e155a8 Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: 7226ad3729 am: a087245e03 am: 3dd40d172b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661581

Change-Id: I99cb5fd94c4ee02688709ad00e3ffbc3e2f388e7
 2021-04-01 13:47:07 +00:00
Aaron Huang
f4c048af1c Merge "Expose BIP and VSIM relavent definitions" am: ef74312993 am: 112185f2fa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652223

Change-Id: Ibab74f3bcf6c804a31be54d4b7183ea75a6e172e
 2021-04-01 13:04:07 +00:00
Treehugger Robot
3dd40d172b Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: 7226ad3729 am: a087245e03 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661581

Change-Id: I70994b32bd4a68bb3d3062d349cc833ba2edf5a0
 2021-04-01 13:02:13 +00:00
Aaron Huang
ef74312993 Merge "Expose BIP and VSIM relavent definitions" 2021-04-01 11:38:17 +00:00
Treehugger Robot
7226ad3729 Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" 2021-04-01 11:27:29 +00:00
Jack Yu
31657c4990 Merge "Display no data notification in certain scenarios" am: 39e56169aa am: 6d858e4d0b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660341

Change-Id: Icd2c42decc94c59189509e3f87115cf847b3a083
 2021-04-01 09:22:34 +00:00
Bob Badour
de423b7a58 [LSC] Add LOCAL_LICENSE_KINDS to frameworks/base 
Added SPDX-license-identifier-Apache-2.0 to:
  drm/java/Android.bp
  graphics/java/Android.bp
  identity/Android.bp
  identity/java/Android.bp
  keystore/java/Android.bp
  location/java/Android.bp
  location/tests/Android.bp
  lowpan/java/Android.bp
  media/mca/effect/java/Android.bp
  media/mca/filterfw/java/Android.bp
  media/mca/filterpacks/java/Android.bp
  mime/java/Android.bp
  mms/java/Android.bp
  opengl/java/Android.bp
  rs/java/Android.bp
  sax/java/Android.bp
  services/tests/servicestests/test-apps/PackageParsingTestManifests/Android.bp
  telecomm/java/Android.bp
  telephony/common/Android.bp
  tests/FlickerTests/test-apps/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to:
  telephony/java/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I2ee0af9ce8f74de2172b359b41d2c52a8b8f7e6c
 2021-03-31 19:55:25 -07:00
TreeHugger Robot
277b6a507e Merge "Update doc to reflect actual permission" into sc-dev am: 75b795f4a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14040170

Change-Id: Ia0e20c5abf6ad3650d8670a235e2ce1333ee291e
 2021-04-01 00:28:08 +00:00
TreeHugger Robot
75b795f4a3 Merge "Update doc to reflect actual permission" into sc-dev 2021-04-01 00:11:26 +00:00
Jack Yu
74342d0f65 Merge "Moved getId API from system to public" am: ffb09e11c1 am: afefc4e426 am: f7a4c40e88 am: 8297a09b3c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640623

Change-Id: I4b2ecd419af94443eab18b105dad3333505a6366
 2021-03-31 23:49:55 +00:00
Jack Yu
7b8ac258b5 Display no data notification in certain scenarios 
For some carriers, display no data notification when
setup data permanently failed (i.e. retry will not hapen)

Bug: 169648447
Test: Manual
Merged-In: Ica20169db3c9230172d2cae80a9e6ba3486bfa42
Change-Id: Ica20169db3c9230172d2cae80a9e6ba3486bfa42
(cherry picked from commit 5badb094f5)
 2021-03-31 16:36:35 -07:00
Jack Yu
8297a09b3c Merge "Moved getId API from system to public" am: ffb09e11c1 am: afefc4e426 am: f7a4c40e88 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640623

Change-Id: I9f1a24505b270989dd1d2dd575c19781054d798f
 2021-03-31 23:30:15 +00:00
Jack Yu
f7a4c40e88 Merge "Moved getId API from system to public" am: ffb09e11c1 am: afefc4e426 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640623

Change-Id: Ibb38cafd12c3ce68b7b75bef2af4565ba4ff6213
 2021-03-31 22:44:06 +00:00
Jack Yu
ffb09e11c1 Merge "Moved getId API from system to public" 2021-03-31 21:56:53 +00:00
Anton Hansson
5879ac0fe4 Merge changes I97086e30,Ic55df4cf,I81a08c29 am: 4199ef90b9 am: 4bc578052d am: ec1f981309 am: 5013902a24 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655736

Change-Id: I8bff7924842316486f5058b241ee728fc74d0c4b
 2021-03-31 18:32:52 +00:00
Anton Hansson
5013902a24 Merge changes I97086e30,Ic55df4cf,I81a08c29 am: 4199ef90b9 am: 4bc578052d am: ec1f981309 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655736

Change-Id: I5d242cf5b18c4b556105cfcfe78df2ac18a8544e
 2021-03-31 18:01:32 +00:00
Anton Hansson
ec1f981309 Merge changes I97086e30,Ic55df4cf,I81a08c29 am: 4199ef90b9 am: 4bc578052d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655736

Change-Id: Ib8d66e1fb8845f3b47fd6e81091c0286ca6c8c9c
 2021-03-31 17:32:14 +00:00
Anton Hansson
4199ef90b9 Merge changes I97086e30,Ic55df4cf,I81a08c29 
* changes:
  Move framework java filegroups into subdirectories
  Partial cp of "Move Tuner resource updating from Tuner java into Tuner client"
  Partial cp of "Initial boilerplate for an updatable graphics jar"
 2021-03-31 16:13:13 +00:00
Sarah Chin
d30c853ac9 DCT set up default before enterprise APN 
Higher priority goes first in mPrioritySortedApnContexts, so change
default priority to be higher than enterprise.

Test: atest DcTrackerTest
Bug: 183738520
Change-Id: Ib2f9594933d00307276f4538714a5354d36baf09
 2021-03-31 00:46:44 -07:00
Jordan Liu
4d1289346b Update doc to reflect actual permission 
Bug: 157650894
Test: make
Change-Id: Ic8385b2cebfaf65d0cc8c078b951090c2babff01
 2021-03-31 00:56:18 +00:00
Treehugger Robot
3ba12c704b Merge "Add carrier config keys for GBA" am: 7715ad3ac8 am: dbc2a426ba 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1657761

Change-Id: I78f1661d3f18daa5e575b8fe6af2564fb495bcda
 2021-03-30 17:44:10 +00:00
Jack Yu
e04e0762a5 Merge "Display no data notification in certain scenarios" into sc-dev am: fa873e1cc8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14020049

Change-Id: I03bba622d614b25a025a7cb3c840a7505b5a5558
 2021-03-30 17:11:25 +00:00
Jack Yu
fa873e1cc8 Merge "Display no data notification in certain scenarios" into sc-dev 2021-03-30 17:02:49 +00:00
Hall Liu
4406bc8575 Add carrier config keys for GBA 
Add keys for values that are expected by carriers when requesting keys

Bug: 182425585
Test: manual
Change-Id: I03487dca483cd91ddcafe9487f211eb3069caf5f
Merged-In: I03487dca483cd91ddcafe9487f211eb3069caf5f
 2021-03-30 22:22:41 +08:00
Anton Hansson
9b2c4a650b Move framework java filegroups into subdirectories 
All the java code used to build the framework jar and run metalava
was previously defined in the toplevel Android.bp files. Move these
into the subdirs where the source actually lives.

This simplifies the rules themselves (no path and needless prefix) and
declutters the top level Android.bp.

Test: m
Change-Id: I97086e309eacb879d16facb8497d9940fa5ddaf6
 2021-03-30 12:26:55 +01:00
James Lin
340de4d666 Merge "Updated the RcsCapabilityExchangeImplBase APIs" am: 47dc400888 am: 4f4713ec67 am: a4829f365a am: 3afabac191 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652213

Change-Id: I5a97bca774ce86cfc122259be267e2b88944290e
 2021-03-30 04:13:31 +00:00
James Lin
3afabac191 Merge "Updated the RcsCapabilityExchangeImplBase APIs" am: 47dc400888 am: 4f4713ec67 am: a4829f365a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652213

Change-Id: I9baf8f72e5dfe33d2e27554f7b8e952ab73ce95d
 2021-03-30 03:57:54 +00:00
James Lin
a4829f365a Merge "Updated the RcsCapabilityExchangeImplBase APIs" am: 47dc400888 am: 4f4713ec67 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652213

Change-Id: I8be9e96e205cc464e8620723361de0277b39b2f8
 2021-03-30 03:07:29 +00:00
James Lin
47dc400888 Merge "Updated the RcsCapabilityExchangeImplBase APIs" 2021-03-30 01:57:10 +00:00
Brad Ebinger
220bc70f97 Merge "Enforce READ_PHONE_STATE for APIs involving call state" into sc-dev am: 3bf5cbb891 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13986047

Change-Id: I185ceb19fc96b1c38731d68757668cd54cdff412
 2021-03-29 21:03:52 +00:00
Brad Ebinger
3bf5cbb891 Merge "Enforce READ_PHONE_STATE for APIs involving call state" into sc-dev 2021-03-29 20:49:36 +00:00
Nathan Harold
b591738bb2 Merge changes from topic "telephony-background-cb" am: f3a83b6c9c am: 365c6b6687 am: 0a247cb555 am: a79ee5c947 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653202

Change-Id: I9690f99c2afd818bd88d58481f41718c06b9f848
 2021-03-29 20:29:55 +00:00
Nathan Harold
a79ee5c947 Merge changes from topic "telephony-background-cb" am: f3a83b6c9c am: 365c6b6687 am: 0a247cb555 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653202

Change-Id: Id6a1712a1522ea767c93d423fd95d35bf5ab9cac
 2021-03-29 19:11:07 +00:00
Nathan Harold
0a247cb555 Merge changes from topic "telephony-background-cb" am: f3a83b6c9c am: 365c6b6687 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653202

Change-Id: I16d744757e26f3cfb0a06ca3f618874dfc221bd4
 2021-03-29 18:41:00 +00:00
Jack Yu
5badb094f5 Display no data notification in certain scenarios 
For some carriers, display no data notification when
setup data permanently failed (i.e. retry will not hapen)

Bug: 169648447
Test: Manual
Change-Id: Ica20169db3c9230172d2cae80a9e6ba3486bfa42
 2021-03-29 11:07:55 -07:00
Nathan Harold
f3a83b6c9c Merge changes from topic "telephony-background-cb" 
* changes:
  Add a Compat Flag for Throwing For Null Telephony
  Ensure Async APIs receive callbacks
 2021-03-29 17:58:41 +00:00
Chiachang Wang
1ed6bf5547 Expose BIP and VSIM relavent definitions 
In order to support special APNs below, OEM may need extra
NetworkCapabilities and apn type definition to support the
carriers request. Add corresponding definition into API
surface.

VSIM: for Virtual SIM service
BIP: for Bearer Independent Protocol

Bug: 130869457
Test: make update-api
Change-Id: I41e881c6fe39e92d5cdac2d0a02fa8a8e814c9c5
Merged-In: I41e881c6fe39e92d5cdac2d0a02fa8a8e814c9c5
 2021-03-26 06:17:25 +00:00
Chiachang Wang
8c0f6af40c Merge "Expose BIP and VSIM relavent definitions" into sc-dev am: e87a4dacd7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13989590

Change-Id: I41f60fb738a288b2f6fb755b6074c8bddaf6b0f4
 2021-03-26 02:51:40 +00:00
Chiachang Wang
e87a4dacd7 Merge "Expose BIP and VSIM relavent definitions" into sc-dev 2021-03-26 02:38:34 +00:00
Nathan Harold
31c7d61624 Add a Compat Flag for Throwing For Null Telephony 
In order to prevent a sea of random crashes as part
of migrating to throwing behavior for callback APIs that
hit null ITelephony and null IOns objects, this change
re-introduces backwards-compatible behavior for APIs that
are being "upgraded" to throwing behavior.

Bug: 182185642
Test: atest CtsTelephonyTestCases
Change-Id: I492ba6a79e74350986afbd6ab5cc5e7b05b8cd35
 2021-03-25 16:45:59 -07:00
Nathan Harold
8c23380d2f Ensure Async APIs receive callbacks 
There are currently a couple silent failure for
APIs that are defined as asynchronous.
-If the remote binder object is null then in some cases
 the response is dropped. It's important that the response
 be triggered on a thread other than the calling one due
 to the oddball possibility of non-reentrant locking.
-If the remote dies while awaiting a response, the RemoteException
 is generally dropped, and because the API is asynchronous there is
 no way for the caller to know, leaving a dangling async request.

This CL ensures that remote exceptions due to process death invoke
the asynchronous callbacks, delivering an error message using the
BackgroundThread to ensure that the calls are received on a thread
other than the original caller's.

Bug: 182185642
Test: atest CtsTelephonyTestCases
Change-Id: I5121734194f07c53f94fb6585da3c90e3e2c4bf7
 2021-03-25 15:46:15 -07:00
Brad Ebinger
a8366aeae4 Enforce READ_PHONE_STATE for APIs involving call state 
For API version 31+, ensure that READ_PHONE_STATE is checked on
APIs that retrieve/notify the call state of the device.

Bug: 157233955
Test: atest CtsTelecomTestCases2 CtsTelephony2TestCases
Change-Id: I9f8674a3075d3e0f75ee4f41eefce328c0fa6b91
 2021-03-25 15:11:00 -07:00
Jayachandran Chinnakkannu
a6aff78d69 Merge "Fix QOS API review comments" am: 301abd2ef8 am: d1f7602682 am: b000d714c0 am: 2d128a462f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653227

Change-Id: I2dc2861d7b0b71df228b37b9700787c3bbe98a19
 2021-03-25 18:41:14 +00:00