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

530618 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Sun
3bf1e46421 Merge "BatteryStats: update to use new notifyWakeup with wakeup reasons" am: 6f000144cd am: 42f35b5081 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1464467

Change-Id: Ie636060b04704b07f242bb68fc934371b9beba48
 2020-10-27 21:26:26 +00:00
Michael Sun
42f35b5081 Merge "BatteryStats: update to use new notifyWakeup with wakeup reasons" am: 6f000144cd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1464467

Change-Id: I4c49a8986be837fad68c3893d6a901c00a19998d
 2020-10-27 21:10:06 +00:00
Michael Sun
6f000144cd Merge "BatteryStats: update to use new notifyWakeup with wakeup reasons" 2020-10-27 20:40:45 +00:00
Treehugger Robot
0c6faf40fd Merge changes from topic "BackportUiAutomatorRetry" am: ff062f6e73 am: ed29b2da3c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471402

Change-Id: I57d108c24027a44fcadee9ee54c69df9696916c8
 2020-10-27 18:47:13 +00:00
JW Wang
125259951c Allow #disconnect to be called safely on connection timeout (2/n) am: 0c56d28a19 am: 68569ea618 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470701

Change-Id: I229063cf0f85a110a15c9aa4dd6ca013f1c06a96
 2020-10-27 18:47:10 +00:00
JW Wang
167b921a80 Add #connectWithTimeout (1/n) am: 67c91c405c am: 4fba545a90 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470700

Change-Id: Ib1d6e7967c63e1e3af632d1ca1760cba705f4a09
 2020-10-27 18:47:05 +00:00
Treehugger Robot
ed29b2da3c Merge changes from topic "BackportUiAutomatorRetry" am: ff062f6e73 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471402

Change-Id: I0de90a96abe80db87569aa7a8d53baf0135812e3
 2020-10-27 18:31:59 +00:00
JW Wang
68569ea618 Allow #disconnect to be called safely on connection timeout (2/n) am: 0c56d28a19 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470701

Change-Id: I8ae08884980d978306ac2b0e9b81fe2c9addad51
 2020-10-27 18:29:46 +00:00
JW Wang
4fba545a90 Add #connectWithTimeout (1/n) am: 67c91c405c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470700

Change-Id: Idab13ed7ae1e20e8a9b064727485db40c3aadd9d
 2020-10-27 18:22:24 +00:00
Treehugger Robot
ff062f6e73 Merge changes from topic "BackportUiAutomatorRetry" 
* changes:
  Let #getUiAutomation return null if UiAutomation fails to connect (3/n)
  Allow #disconnect to be called safely on connection timeout (2/n)
  Add #connectWithTimeout (1/n)
 2020-10-27 17:48:30 +00:00
JW Wang
b5f26d897d Let #getUiAutomation return null if UiAutomation fails to connect (3/n) 
Now #getUiAutomation returns null if the underlying UiAutomation fails
to connect for targetSdkVersion > R. This gives the caller a chance to
retry and decide when to give up.

Bug: 147785023
Test: presubmit
Change-Id: Ibf201fa042b80c067f2a0c3b0bde23adf9c60546
Merged-In: Ibf201fa042b80c067f2a0c3b0bde23adf9c60546
 2020-10-27 16:32:19 +00:00
JW Wang
0c56d28a19 Allow #disconnect to be called safely on connection timeout (2/n) 
Now #disconnect won't throw if the previous #connect failed due to
timeout. Note we also introduce generation id so we won't receive
notifications or modifications from the previous client to disrupt
UiAutomation's status when making the next connection.

Bug: 147785023
Test: m
Change-Id: Idf77207124494bd78770b8ea5d9ac4b1fd1a490a
Merged-In: Idf77207124494bd78770b8ea5d9ac4b1fd1a490a
 2020-10-27 16:31:43 +00:00
Treehugger Robot
8c4cdcdccf Merge changes Id53a8305,Ie74822a6 am: 33f7bff2ea am: 15805a44cd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466223

Change-Id: If85f373336fe2924731cbe14aeae1956b207fa50
 2020-10-27 14:08:05 +00:00
Treehugger Robot
15805a44cd Merge changes Id53a8305,Ie74822a6 am: 33f7bff2ea 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466223

Change-Id: Iae985abf14df61042a9b3557c2caafdad123ef5b
 2020-10-27 13:51:52 +00:00
Mathew Inwood
e8757a24ad Merge "Clarify error message when signature in list.txt does not exist." am: a6ed7b79ed am: 5072b29f66 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1473730

Change-Id: I7ddc1577b017193a006091541d32e1d2a27be94b
 2020-10-27 13:44:11 +00:00
Treehugger Robot
33f7bff2ea Merge changes Id53a8305,Ie74822a6 
* changes:
  CEC : Add OSD String Validator for CEC Messages
  CEC : Add ASCII validator for CEC messages
 2020-10-27 13:08:44 +00:00
Mathew Inwood
5072b29f66 Merge "Clarify error message when signature in list.txt does not exist." am: a6ed7b79ed 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1473730

Change-Id: I4b66f6006526ddbabaaeaf903799d012dc4b991a
 2020-10-27 12:53:05 +00:00
Mathew Inwood
a6ed7b79ed Merge "Clarify error message when signature in list.txt does not exist." 2020-10-27 12:33:40 +00:00
Anton Hansson
9563c9801a Merge "Annotate large droidstubs modules high_mem" am: 6aebdcbcb8 am: 13444871fb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1473726

Change-Id: I2bd10d56bb0319cb367f455bf7fa62bedb37477d
 2020-10-27 09:09:45 +00:00
Anton Hansson
13444871fb Merge "Annotate large droidstubs modules high_mem" am: 6aebdcbcb8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1473726

Change-Id: I3d6a48ca39bdb69f7ad17029928ca6e00b0f1c5c
 2020-10-27 08:46:37 +00:00
Anton Hansson
6aebdcbcb8 Merge "Annotate large droidstubs modules high_mem" 2020-10-27 08:07:08 +00:00
Michael Sun
060a1ca3ff BatteryStats: update to use new notifyWakeup with wakeup reasons 
As SystemSuspend support notifyWakeup callback with wakeup reason
embedded, BatteryStats no longer required to pull such reasons from
kernel files by itself.

Test: adb shell dumpsys batterystats --history
Bug: 171021049
Change-Id: I69717387586994b744297f5ac0f5b66ef2bdce32
 2020-10-27 05:54:34 +00:00
Treehugger Robot
5074242416 Merge "Cleanup references to system/core/liblog -> system/logging/liblog" am: f8f8acfe12 am: 5a42765d79 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1474156

Change-Id: I32fa87e7376e54b3e0d40d675fe1cbb03ab4b446
 2020-10-27 04:21:42 +00:00
Treehugger Robot
5a42765d79 Merge "Cleanup references to system/core/liblog -> system/logging/liblog" am: f8f8acfe12 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1474156

Change-Id: I4dfb3cf36c70583213870af1413a48f57ca17847
 2020-10-27 03:45:46 +00:00
Treehugger Robot
f8f8acfe12 Merge "Cleanup references to system/core/liblog -> system/logging/liblog" 2020-10-27 03:33:37 +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
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
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
Mathew Inwood
2bbe471076 Clarify error message when signature in list.txt does not exist. 
The previous error didn't really explain the problem from the users point
of view.

Test: modify hiddenapi-unsupported.txt and build
Change-Id: I6f551343db84b20b32a963dccddf10cd08ea2be7
 2020-10-26 16:53:09 +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
Baligh Uddin
f2c42889fb Cleanup references to system/core/liblog -> system/logging/liblog 
BUG: 170387172
Test: TH
Change-Id: Ifb2bd2c3db97c52baeac6f2e3643dabf6fcfde6e
 2020-10-26 14:36:03 +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
Anton Hansson
3514689f05 Annotate large droidstubs modules high_mem 
Previously all droidstubs modules were classified as highmem. Annotate
only the huge modules as such, to allow more parallelization of lowmem
droidstubs modules.

Bug: 170701554
Test: NINJA_HIGHMEM_NUM_JOBS=3 m checkapi
Change-Id: I83ae88222110d7afe4009076e951c88a5188ca83
 2020-10-26 11:38:44 +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
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
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