Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
558,348 Commits 3 Branches 0 Tags
5737b2e2b6ae98ea032de165add4a046a445469c
Commit Graph

558348 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
5737b2e2b6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ef2b59b1df -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2088bebf18b05400c7f23a1a330ad40b8f69fd5b
 2020-10-26 03:06:20 +00:00
Bill Yi
ef2b59b1df Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id20257275834977c63dfae80c7adabc97d86014b
 2020-10-25 11:50:10 -07:00
Hall Liu
22244c8ed3 Merge "Update PhoneStateListener#onOutgoingEmergencySms" am: c5d02da0f6 am: b37753c29a am: 75c5434ddd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470691

Change-Id: I830b4bc2db3c53c5c2f21ba1f099af8eaccbfe70
 2020-10-23 21:03:16 +00:00
Treehugger Robot
8500c90d5c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b7dc979577 -s ours am: fba69cad44 -s ours am: e8b43ffeed -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I79e5efb3a72153fdf1cf7ae5e6ab84e3e10bec3f
 2020-10-23 21:02:47 +00:00
Treehugger Robot
48225d0851 Merge "Keystore SPI: Fix typos." am: 881b75d3ed am: b0421a53b2 am: c1892e8344 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470257

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

Change-Id: Ibac491dcbabb45d3218edac6abd03f93f1db609d
 2020-10-23 21:01:51 +00:00
TreeHugger Robot
76a3d05ac8 [automerger skipped] Merge "initialized carrier_certificate_string_array to an empty array instead of null, so that when a certificate is removed, it is also removed in SubscriptionInfoUpdater#updateSubscriptionByCarrierConfig" into rvc-qpr-dev am: f376b8bed7 -s ours 
am skip reason: Change-Id I921007498f42119581f565fcc6625c1275c59df8 with SHA-1 c4eb0d2ff0 is in history

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

Change-Id: I1d9b31d2877311589e593eb94e15b4c066ae1c46
 2020-10-23 21:01:19 +00:00
TreeHugger Robot
f376b8bed7 Merge "initialized carrier_certificate_string_array to an empty array instead of null, so that when a certificate is removed, it is also removed in SubscriptionInfoUpdater#updateSubscriptionByCarrierConfig" into rvc-qpr-dev 2020-10-23 20:39:57 +00:00
Hall Liu
75c5434ddd Merge "Update PhoneStateListener#onOutgoingEmergencySms" am: c5d02da0f6 am: b37753c29a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470691

Change-Id: Id088ab1812bb080f0384df2f54e40917fc862440
 2020-10-23 20:25:00 +00:00
Treehugger Robot
e8b43ffeed [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b7dc979577 -s ours am: fba69cad44 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I668a3b52ea71aa484a8a56f4835764a778398324
 2020-10-23 20:24:05 +00:00
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
Hall Liu
b37753c29a Merge "Update PhoneStateListener#onOutgoingEmergencySms" am: c5d02da0f6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470691

Change-Id: I5edcfe057174d1b6e9d4c0c55540031653c7e14f
 2020-10-23 20:09:42 +00:00
Treehugger Robot
fba69cad44 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b7dc979577 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic5ccd4c6aadd361110d4e36784dfcfc2b66c6ddd
 2020-10-23 20:02:48 +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
7eebf2a93a Merge "Make the connection between implementation and llndk_library explicit" am: 3e7b21c1b6 am: 2cbc12ba3e am: e0f4fce861 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1465666

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

Change-Id: I556ff71b0883e0f024dcf3275afaabda88aad4ac
 2020-10-23 19:41:07 +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
Hall Liu
c5d02da0f6 Merge "Update PhoneStateListener#onOutgoingEmergencySms" 2020-10-23 19:15:22 +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
b7dc979577 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-10-23 18:37:09 +00:00
Sarah Chin
42e6fc36db [automerger skipped] Merge "Add read/write logic for SubscriptionPlan network types field" am: f4847995bc am: 19519ff57f -s ours am: 049001bac4 -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: I85c3a7fdf5ce03cca230202a751a699872c3b48d
 2020-10-23 18:35:49 +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
a230de92fe Merge "Add a mutability flag to the PendingIntent" am: 2a4ac569b0 am: 0cfb318d10 am: 49a146399c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456120

Change-Id: I7018d8afbd43690810d6b00683c6e7d26091e8ae
 2020-10-23 11:11:41 +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
Bill Yi
b8022b235b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I34e8bcf3c3f0a5db3522b6ff499ba1583577b250
 2020-10-22 23:40:39 -07:00
Lucas Lin
58fd9a8f5e Merge "Using Context#getSystemService instead of ServiceManager#checkService" am: d769b3863e am: bb6fc081c2 am: 1dcea14b37 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1463902

Change-Id: I5c37ff8092125e979b83cfb8207f45507ed6c604
 2020-10-23 04:46:05 +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
Mark Chien
2e5154b9e9 Merge "Bump Tethering apex version code" into rvc-d1-dev-plus-aosp am: 491463a35f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12890938

Change-Id: I5770c27e0078a71b8e41ea4915b5f7439f45e8a2
 2020-10-23 03:49:21 +00: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
f2addd13df Merge changes from topic "mainline-telecom-constants" am: c155bb62a1 am: e5eef00627 am: 0494ed6b1e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471168

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

Change-Id: Iaab53ad343a38a3764344f6e5ace2f7e242c79c1
 2020-10-23 03:46:06 +00:00
Automerger Merge Worker
a9479251ba Merge "Merge "Add Handover Failure Mode to Radio Hal" am: f86143770f am: 8cae5f921c am: 6f5eda09a7" into rvc-qpr-dev-plus-aosp 2020-10-23 03:44:22 +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
Amit Mahajan
60015d8728 Merge "Mark deleteMessageFromIcc() as @UnsupportedAppUsage." into rvc-qpr-dev am: ce7806da32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12895790

Change-Id: I55b4a9834a7c5f0b3bd7f4c6e21c5f254e0f88c9
 2020-10-23 03:43:43 +00:00
Daniel Bright
f9cacc8dd2 Merge "Add Handover Failure Mode to Radio Hal" am: f86143770f am: 8cae5f921c am: 6f5eda09a7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469711

Change-Id: I05ed3d0c6ae86550bcb8617901b0531d13fffaa1
 2020-10-23 03:43:40 +00:00