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

558388 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chiachang Wang
cb9530f2cc Merge "Expose NetworkRegistrationInfo.getNrState() as public API" am: f177ac1348 am: b637605947 am: ab746aa210 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1467045

Change-Id: I111cbae01fb9aea68a9bc0b63bd6f5caae4011e9
 2020-10-27 03:46:29 +00:00
Chiachang Wang
ab746aa210 Merge "Expose NetworkRegistrationInfo.getNrState() as public API" am: f177ac1348 am: b637605947 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1467045

Change-Id: Ib6f1a78fc0c0bbe67f5f410ae3c71c935494b25c
 2020-10-27 03:32:55 +00:00
Chiachang Wang
b637605947 Merge "Expose NetworkRegistrationInfo.getNrState() as public API" am: f177ac1348 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1467045

Change-Id: Id036b8bf3114875560d3565c377718ab6824c50e
 2020-10-27 03:09:17 +00:00
Chiachang Wang
f177ac1348 Merge "Expose NetworkRegistrationInfo.getNrState() as public API" 2020-10-27 02:53:59 +00:00
Chiachang Wang
d32aa193fd Expose NetworkRegistrationInfo.getNrState() as public API 
ConnectivityService is going to become a mainline module which
will not able to access hidden APIs. DataConnectionStat needs
to get the NR 5G state of the mobile data network for checking
if the network type is 5G or not. API in NetworkRegistrationInfo
is suggested to replace the original one in ServiceState. Thus,
expose it as a public API to support it.

Bug: 171183530
Test: make update-api ; m
Test: atest CtsTelephonyTestCases
Change-Id: I965499792286de4f1447559be66ca4be80bd0e6f
 2020-10-27 02:53:11 +00:00
TreeHugger Robot
4332cd04e6 Merge "Revert "Distinguish warm/hot launch by whether the activity has attached process"" into rvc-qpr-dev am: d410132104 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12921853

Change-Id: I23f96e6aa812ec901dd6ea571292ec17f5002709
 2020-10-27 02:16:52 +00:00
TreeHugger Robot
d410132104 Merge "Revert "Distinguish warm/hot launch by whether the activity has attached process"" into rvc-qpr-dev 2020-10-27 02:03:19 +00:00
Shubang Lu
3a1f6225c2 Revert "Distinguish warm/hot launch by whether the activity has attached process" 
This reverts commit 20efc15caa.

Reason for revert: Droidcop: Potential culprit for Bug b/171719665 - verifying through Forrest before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Merged-In: I18e2f1a5eaf1e07b96d6135be56f8077d37b7504
Change-Id: I46d622d34a984bf40fe9cbb4a6454e41861d8027
 2020-10-26 22:32:54 +00:00
Mohammad Islam
b278864fa3 Merge changes I5dcaabaa,I998cf688 am: 8dddad53d5 am: c1b51c398b am: 493bf0db1b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433440

Change-Id: I60bbc44fe2ffdc81da3c1b0a8a4e2d3cb949f420
 2020-10-26 21:16:50 +00:00
Mohammad Samiul Islam
84a83cfa91 Simplify flags used to wait for staged session ready am: 27b68d1e65 am: 236d8d9b24 am: f00de86582 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433439

Change-Id: I3bbec8c47ac36060065372ba1268d73c58e0c345
 2020-10-26 21:16:47 +00:00
Mohammad Islam
493bf0db1b Merge changes I5dcaabaa,I998cf688 am: 8dddad53d5 am: c1b51c398b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433440

Change-Id: I18aa4a6180cea3565b9f92f0033d50aafb28cc64
 2020-10-26 20:40:51 +00:00
Mohammad Samiul Islam
f00de86582 Simplify flags used to wait for staged session ready am: 27b68d1e65 am: 236d8d9b24 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433439

Change-Id: Ief738ac0019662376f927f3c700ed6cc3468b07c
 2020-10-26 20:40:43 +00:00
Mohammad Islam
c1b51c398b Merge changes I5dcaabaa,I998cf688 am: 8dddad53d5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433440

Change-Id: I3c22682e68f2d9a1eefbfdf6c673ede87c3aa89d
 2020-10-26 20:13:17 +00:00
Mohammad Samiul Islam
236d8d9b24 Simplify flags used to wait for staged session ready am: 27b68d1e65 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433439

Change-Id: I41724aca8a62edf2e93f1ab70910363303599805
 2020-10-26 20:02:19 +00:00
Mohammad Islam
8dddad53d5 Merge changes I5dcaabaa,I998cf688 
* changes:
  Make rollback-app support --staged-ready-timeout flag
  Simplify flags used to wait for staged session ready
 2020-10-26 19:45:06 +00:00
Tyler Gunn
25be0a9261 [automerger skipped] Merge "Modify the TelecomLoaderService to provide LocalServices to Telecom" am: 5c17953fb7 am: 8f430654a3 am: cf81701713 -s ours 
am skip reason: Change-Id I3d71331cbc8f01f764cc0b9704416821007feeb5 with SHA-1 4cead2c3e8 is in history

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

Change-Id: I71db329e51eb56c14b3e3a38e6a4399ea6fbf8f2
 2020-10-26 17:29:06 +00:00
Tyler Gunn
cf81701713 Merge "Modify the TelecomLoaderService to provide LocalServices to Telecom" am: 5c17953fb7 am: 8f430654a3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470697

Change-Id: Iff4f12399d3eac669dbe29e183fb3348f0e7b68b
 2020-10-26 17:10:31 +00:00
Tyler Gunn
8f430654a3 Merge "Modify the TelecomLoaderService to provide LocalServices to Telecom" am: 5c17953fb7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470697

Change-Id: Iaf9a8009a6fcd71cacf20b6fb781e586e62b6004
 2020-10-26 16:41:08 +00:00
Tyler Gunn
5c17953fb7 Merge "Modify the TelecomLoaderService to provide LocalServices to Telecom" 2020-10-26 15:59:36 +00:00
Riddle Hsu
2e96200648 Merge "Distinguish warm/hot launch by whether the activity has attached process" into rvc-qpr-dev am: 2ef418cd37 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12918777

Change-Id: Idab9dccb55112fc9cdeb3379d7f772c8344d68a4
 2020-10-26 13:23:08 +00:00
Riddle Hsu
2ef418cd37 Merge "Distinguish warm/hot launch by whether the activity has attached process" into rvc-qpr-dev 2020-10-26 12:57:50 +00:00
Treehugger Robot
9e5cd9415b Merge "Add shared jarjar rule for tethering tests" am: 29dc671218 am: 2dc283eeca am: dc937ecdbd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1473223

Change-Id: Ie1e828e976b798c65df688b2ce43f60fc07d633b
 2020-10-26 12:57:09 +00:00
Treehugger Robot
dc937ecdbd Merge "Add shared jarjar rule for tethering tests" am: 29dc671218 am: 2dc283eeca 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1473223

Change-Id: I34c41fbbe5f034a2ed332c784ab0decb2c6b2add
 2020-10-26 12:40:34 +00:00
Treehugger Robot
2dc283eeca Merge "Add shared jarjar rule for tethering tests" am: 29dc671218 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1473223

Change-Id: I8475c680298af4b6239b37c0e43f6917491b783f
 2020-10-26 12:13:59 +00:00
Treehugger Robot
29dc671218 Merge "Add shared jarjar rule for tethering tests" 2020-10-26 11:43:59 +00:00
markchien
7634bcfa49 Add shared jarjar rule for tethering tests 
Also jarjar com.android.net.module.util* to
com.android.networkstack.tethering.util*.

Bug: 171670016
Test: atest TetheringCoverageTests
Change-Id: I3bde9ad3c41adf36da99bd944303d88ce992201c
 2020-10-26 18:20:25 +08:00
Mathew Inwood
bc01819b67 Merge "Support adding custom tags to APIs." am: 841022227d am: 5349732bf4 am: 571321c458 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469444

Change-Id: I8a35e6224bc82585dca235ee40f8b2103a95c64b
 2020-10-26 10:20:09 +00:00
Riddle Hsu
20efc15caa Distinguish warm/hot launch by whether the activity has attached process 
If the process of an activity was died in background, its activity and
task record will still be in history stack. If the process is started
again in background such as receiving broadcast. Then the launch of the
same activity will have the conditions: process exists and the result
code is START_TASK_TO_FRONT. But the activity still need to create so
it should be warm launch.

Fixes: 171549711
Test: ActivityMetricsLaunchObserverTests#testOnActivityLaunchFinished
Change-Id: Iaf53ab8a35192249c20a73d9cb0de2a5e8effc64
Merged-In: Iaf53ab8a35192249c20a73d9cb0de2a5e8effc64
(cherry picked from commit 2e039cd3bc)
 2020-10-26 09:59:59 +00:00
Mathew Inwood
571321c458 Merge "Support adding custom tags to APIs." am: 841022227d am: 5349732bf4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469444

Change-Id: I989ec30f75b529556c17b19f58da25efd51d4259
 2020-10-26 09:59:07 +00:00
Mathew Inwood
5349732bf4 Merge "Support adding custom tags to APIs." am: 841022227d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469444

Change-Id: I55812bed4c127e07a4ff21f2bd801f15a988e410
 2020-10-26 09:40:40 +00:00
Mathew Inwood
841022227d Merge "Support adding custom tags to APIs." 2020-10-26 08:52:11 +00:00
Paul Hu
b2d171191d Merge "Replace PendingIntent @hide APIs" am: 1cec9a2671 am: 97adf1f334 am: 17e6bc6a4c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456121

Change-Id: I837c5cd9ebc46e350e3c7950323614df4cbc38f3
 2020-10-26 08:26:40 +00:00
Paul Hu
17e6bc6a4c Merge "Replace PendingIntent @hide APIs" am: 1cec9a2671 am: 97adf1f334 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456121

Change-Id: I18693b621bcae7a011719324bd8bede302d22efb
 2020-10-26 07:59:15 +00:00
Paul Hu
97adf1f334 Merge "Replace PendingIntent @hide APIs" am: 1cec9a2671 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456121

Change-Id: I134bd5f89973e242f7b75f2baa4617e8ad1cb644
 2020-10-26 07:46:42 +00:00
Paul Hu
1cec9a2671 Merge "Replace PendingIntent @hide APIs" 2020-10-26 07:32:56 +00:00
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