Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
530,552 Commits 3 Branches 0 Tags
c1892e83442e5e7c99c85633806cbdfd0835ca7d
Commit Graph

530552 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
c1892e8344 Merge "Keystore SPI: Fix typos." am: 881b75d3ed am: b0421a53b2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470257

Change-Id: I4f925b1b601b3c9b11d162bd08cf1066a0db21e6
 2020-10-23 20:23:51 +00:00
Hall Liu
1fd0a64a11 Merge "Expose methods to enumerate constants" am: ae9309bc05 am: 037195448a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470085

Change-Id: Ibc9d14d684dc84befd0d3bdecc6bc974b302c1d8
 2020-10-23 20:23:10 +00:00
Treehugger Robot
b0421a53b2 Merge "Keystore SPI: Fix typos." am: 881b75d3ed 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470257

Change-Id: Ibe0803db78b3a8318be0c479aec39defb14461dd
 2020-10-23 19:58:59 +00:00
Hall Liu
037195448a Merge "Expose methods to enumerate constants" am: ae9309bc05 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470085

Change-Id: I94962c9e84cf186d9b5af95522a9140b6410341f
 2020-10-23 19:54:57 +00:00
Colin Cross
e0f4fce861 Merge "Make the connection between implementation and llndk_library explicit" am: 3e7b21c1b6 am: 2cbc12ba3e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1465666

Change-Id: Ia864d062e12ea0bfe04fc730ea531f40a86bf084
 2020-10-23 19:24:43 +00:00
Benedict Wong
51edaf6a08 Merge "Add VCN file owners for android.net.vcn" am: b397a4f3ff am: 3086c9bf3b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459343

Change-Id: I91f0fe422036a0e159586d569528a0b769661516
 2020-10-23 19:23:34 +00:00
Colin Cross
2cbc12ba3e Merge "Make the connection between implementation and llndk_library explicit" am: 3e7b21c1b6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1465666

Change-Id: Ie3f0d619cf1a00788a5ce35b030801a98e1cf1f6
 2020-10-23 19:00:05 +00:00
Benedict Wong
3086c9bf3b Merge "Add VCN file owners for android.net.vcn" am: b397a4f3ff 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459343

Change-Id: Ia3ff368a1a3282c91d48f64c70e552dacbefdea2
 2020-10-23 18:48:26 +00:00
Treehugger Robot
881b75d3ed Merge "Keystore SPI: Fix typos." 2020-10-23 18:35:19 +00:00
Sarah Chin
049001bac4 [automerger skipped] Merge "Add read/write logic for SubscriptionPlan network types field" am: f4847995bc am: 19519ff57f -s ours 
am skip reason: Change-Id Ib821590a573db87b22619cfe7ebe64c0230c5031 with SHA-1 8fce85a6f8 is in history

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

Change-Id: Iac744635902fd99b04591a4ed25e145d40b5fd0b
 2020-10-23 18:15:24 +00:00
Hall Liu
ae9309bc05 Merge "Expose methods to enumerate constants" 2020-10-23 18:12:10 +00:00
Colin Cross
3e7b21c1b6 Merge "Make the connection between implementation and llndk_library explicit" 2020-10-23 18:09:42 +00:00
Sarah Chin
19519ff57f Merge "Add read/write logic for SubscriptionPlan network types field" am: f4847995bc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1438917

Change-Id: I24ffa59f2d79cfb60b514eeb28725e88738829f7
 2020-10-23 17:57:29 +00:00
Benedict Wong
b397a4f3ff Merge "Add VCN file owners for android.net.vcn" 2020-10-23 17:44:05 +00:00
Sarah Chin
f4847995bc Merge "Add read/write logic for SubscriptionPlan network types field" 2020-10-23 17:15:03 +00:00
Treehugger Robot
49a146399c Merge "Add a mutability flag to the PendingIntent" am: 2a4ac569b0 am: 0cfb318d10 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456120

Change-Id: Id09c2c39f6ba7ecd68d1b5c792b300ae33c30278
 2020-10-23 10:27:28 +00:00
Treehugger Robot
0cfb318d10 Merge "Add a mutability flag to the PendingIntent" am: 2a4ac569b0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456120

Change-Id: I8c00c4b866562cb02fb085a7ba05e1ce1db44f77
 2020-10-23 10:07:43 +00:00
Treehugger Robot
2a4ac569b0 Merge "Add a mutability flag to the PendingIntent" 2020-10-23 09:49:27 +00:00
Lucas Lin
1dcea14b37 Merge "Using Context#getSystemService instead of ServiceManager#checkService" am: d769b3863e am: bb6fc081c2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1463902

Change-Id: I453b183add07e6b3e3d24138d62ceb2c800710cc
 2020-10-23 04:30:27 +00:00
Janis Danisevskis
bb4e97ebf3 Keystore SPI: Fix typos. 
Test: None
Change-Id: Iba25385b42db8059cc0811e99463e01acb98e00f
 2020-10-22 21:03:32 -07:00
Lucas Lin
bb6fc081c2 Merge "Using Context#getSystemService instead of ServiceManager#checkService" am: d769b3863e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1463902

Change-Id: I8097dd8136424af6437914631592999d0f839758
 2020-10-23 03:47:54 +00:00
Mark Chien
491463a35f Merge "Bump Tethering apex version code" into rvc-d1-dev-plus-aosp 2020-10-23 03:46:34 +00:00
Hall Liu
0494ed6b1e Merge changes from topic "mainline-telecom-constants" am: c155bb62a1 am: e5eef00627 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471168

Change-Id: I359712580db9387032db37029ccfc8461d64fe5e
 2020-10-23 03:44:12 +00:00
Hall Liu
5cff38cc1b API tweaks in response to feedback am: 5968c09340 am: 429a15d480 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471167

Change-Id: Id99748d0b831349929744ecd24c5ba1069054633
 2020-10-23 03:44:08 +00:00
Lucas Lin
d769b3863e Merge "Using Context#getSystemService instead of ServiceManager#checkService" 2020-10-23 03:08:16 +00:00
lucaslin
6a297b8aac Using Context#getSystemService instead of ServiceManager#checkService 
ConnectivityService is going to be a mainline module, it can only
use formal APIs or @SystemApi. So use public API -
Context#getSystemService() instead of hidden API -
ServiceManager#checkService().

Bug: 170598012
Test: atest FrameworksNetTests
Change-Id: I9824caa7aec57e70f0ba405fcce39f9bc068732d
 2020-10-23 03:07:07 +00:00
Hall Liu
644532e774 Expose methods to enumerate constants 
Expose TelephonyManager#getAllNetworkTypes and
CellSignalStrength#getNumSignalStrengthLevels as utility methods for
other apps.

Fixes: 170781542
Test: atest TelephonyManagerTest
Change-Id: Ie516792a7522dd0df09d7b97f0b764d776559bf1
Merged-In: Ie516792a7522dd0df09d7b97f0b764d776559bf1
 2020-10-22 17:01:04 -07:00
Daniel Bright
6f5eda09a7 Merge "Add Handover Failure Mode to Radio Hal" am: f86143770f am: 8cae5f921c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469711

Change-Id: I59541adf98e8b992ef8af5f2a452fc0ddc5fc28a
 2020-10-22 23:22:12 +00:00
Hall Liu
e5eef00627 Merge changes from topic "mainline-telecom-constants" am: c155bb62a1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471168

Change-Id: I5da60e9f18ee80293baf2b0a1a5734d72b20f907
 2020-10-22 23:20:40 +00:00
Hall Liu
429a15d480 API tweaks in response to feedback am: 5968c09340 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471167

Change-Id: Iddee215c5ea2e5b5cf3e751d6d995eada9e2d1ef
 2020-10-22 23:18:02 +00:00
Benedict Wong
30a7ae8af7 Add VCN file owners for android.net.vcn 
This change adds owners for the VCN files in the android.net.vcn package

Bug: 163431877
Test: No code changes; FrameworksNetTests passing
Change-Id: I7406083b958a9fd5f1b02c2e2046a9c686622f60
 2020-10-22 23:08:49 +00:00
Hall Liu
c155bb62a1 Merge changes from topic "mainline-telecom-constants" 
* changes:
  Update documentation for phone account sort order
  API tweaks in response to feedback
 2020-10-22 23:04:01 +00:00
Daniel Bright
8cae5f921c Merge "Add Handover Failure Mode to Radio Hal" am: f86143770f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469711

Change-Id: I44f9260f7c145d7d39918051bc556ced65716db0
 2020-10-22 22:24:06 +00:00
Automerger Merge Worker
70ad24f2df [automerger skipped] Merge changes from topic "am-b83fc5b0dcfc43208a9ca1af164efd6e" into stage-aosp-master am: b7357aca03 -s ours 
am skip reason: Change-Id I9aa69c9bd8d31e6bbdd9a237b0aa2c3922431227 with SHA-1 c4587ed1c9 is in history

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

Change-Id: I44bdb6c7c62135bd8608f1a38f905ba8a79d6515
 2020-10-22 21:51:48 +00:00
Hall Liu
ebb53bbb2b Merge changes from topic "expose-call-forward" am: f0b822c8bb am: 5abd8781fd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471163

Change-Id: If5d2a4c5eaa6edead7e036f1740d0fcc752010b5
 2020-10-22 21:50:52 +00:00
Hall Liu
af7d2858e3 Expose and update the call forward/waiting APIs am: 8410239d72 am: 84a9653e18 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471162

Change-Id: I97a2186c08d2cbbcc8f4111c6f7abdd60b2bf1de
 2020-10-22 21:50:49 +00:00
Hall Liu
dacbfa7ed8 Merge changes from topic "telephonymanager-data-policy" am: 3a14c6bdcc am: 4e254916f0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469718

Change-Id: Ida4ad72ab7b1e3d7cc34342b5bf78b91b7b5d1c3
 2020-10-22 21:49:20 +00:00
Hall Liu
44eed5a8d9 Add new methods for setting mobile data policy am: 83bb093cc5 am: f784eebb36 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469717

Change-Id: I968c04c3c257a487ffc4019843c9376b83f3c380
 2020-10-22 21:49:15 +00:00
Hall Liu
6ae0e0d498 Merge changes from topic "move-emergency-phone-update" am: 77b5c5a31b am: 4c805f8ed6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470383

Change-Id: I993099a22efc5f2fefbf724a59f8b482abad91c7
 2020-10-22 21:48:16 +00:00
Hall Liu
1e7790f927 Call onOutgoingEmergencyCall only once. am: 486ef8978d am: 2c0e19cf79 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470382

Change-Id: I8821c396a8299120ee9faa2d08e9f4f1274cc97a
 2020-10-22 21:48:14 +00:00
Hall Liu
266e87e5a9 Expose onEmergencyNumberListChanged, semantics change am: e182543791 am: f8e5b6fd6e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469715

Change-Id: I90f50754ce96fb39a17ff6d4b973a414ab289733
 2020-10-22 21:48:09 +00:00
Daniel Bright
f86143770f Merge "Add Handover Failure Mode to Radio Hal" 2020-10-22 21:38:58 +00:00
Automerger Merge Worker
b7357aca03 Merge changes from topic "am-b83fc5b0dcfc43208a9ca1af164efd6e" into stage-aosp-master 
* changes:
  Merge changes from topic "telephonymanager-data-policy" am: 3a14c6bdcc
  Add new methods for setting mobile data policy am: 83bb093cc5
 2020-10-22 21:35:15 +00:00
Hall Liu
5abd8781fd Merge changes from topic "expose-call-forward" am: f0b822c8bb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471163

Change-Id: I12392eee398fef6be867a10cf6d627a1c4b3eea8
 2020-10-22 21:26:05 +00:00
Hall Liu
2b24ea5a87 Merge changes from topic "telephonymanager-data-policy" am: 3a14c6bdcc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469718

Change-Id: I716a51456ab4c347294481df6cf62c7825b089c2
 2020-10-22 21:23:08 +00:00
Hall Liu
84a9653e18 Expose and update the call forward/waiting APIs am: 8410239d72 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471162

Change-Id: Icd499ce501a1b418e23a550154d642a52ccb5c3d
 2020-10-22 21:22:32 +00:00
Hall Liu
04deccd68f Add new methods for setting mobile data policy am: 83bb093cc5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469717

Change-Id: I378bc6c1190301f996bc2048dcf1d958b469d2ec
 2020-10-22 21:19:12 +00:00
Hall Liu
4e254916f0 Merge changes from topic "telephonymanager-data-policy" am: 3a14c6bdcc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469718

Change-Id: I4dd5dfa39c61c04b995238f4f4dc4837871d0e58
 2020-10-22 21:16:55 +00:00
Hall Liu
f784eebb36 Add new methods for setting mobile data policy am: 83bb093cc5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469717

Change-Id: I86ace597ffeca7bcb0bb73b2b5ea617df80627ab
 2020-10-22 21:14:05 +00:00
Hall Liu
2cf63f72cd Update documentation for phone account sort order 
Update documentation to reflect that the sort order extra
should contain integers.

Bug: 169153499
Test: docs only
Change-Id: Ic5269d577f007e01a0c9eaa95cd7e8814ab8f79a
Merged-In: Ic5269d577f007e01a0c9eaa95cd7e8814ab8f79a
 2020-10-22 14:07:38 -07:00