drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
627,502 Commits 1 Branch 0 Tags
Commit Graph

627502 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
1ab4403390 Merge "Support regular toolbar" into sc-dev 2021-03-04 12:15:32 +00:00
Lucas Lin
0292235a96 Merge "Use public API Network#getNetId() to get netid" 2021-03-04 11:05:55 +00:00
Nathalie Le Clair
da70abc9e1 Merge changes Ie0a7ec38,I5199dc85 
* changes:
  Handle messages in standby for DeviceDiscoveryAction
  Prevent periodic actions from starting twice
 2021-03-04 11:01:12 +00:00
Zimuzo Ezeozue
ed23887b8e Merge changes I2a817d71,I86f800c4 into sc-dev 
* changes:
  Avoid waiting for the async notifyAnrDelayStarted
  Implement ANR delay with app IO blocked reason
 2021-03-04 10:37:03 +00:00
Tom Natan
c99e9aff22 Merge "Add letterbox information in ActivityRecord#dump" into sc-dev 2021-03-04 09:35:10 +00:00
Treehugger Robot
bff3cb288c Merge "Remove unused errorMessage" am: 78a488cd10 am: fd426e18cd am: 2f5ce95057 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1616687

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06708ad8febc8df30eb7dcc657f2b791e97a03e2
 2021-03-04 08:03:50 +00:00
TreeHugger Robot
637ceb4e6a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 8d3c2c1455 -s ours am: dfe17d4e68 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib634eed346c9d9ab4d82401510a842aff050cd5e
 2021-03-04 08:03:13 +00:00
TreeHugger Robot
7c56231b07 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 43ccc03aa0 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0dc9daaba546798d2ee40e684564a2cdfee4a652
 2021-03-04 08:02:51 +00:00
Aaron Huang
70738d3c69 Merge "Use NetworkCallback in BatteryStatsService to get connectivity change" into sc-dev 2021-03-04 07:49:16 +00:00
Treehugger Robot
2f5ce95057 Merge "Remove unused errorMessage" am: 78a488cd10 am: fd426e18cd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1616687

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibb0d9947c75984e31b21820359de19b8526c72fd
 2021-03-04 07:19:44 +00:00
TreeHugger Robot
dfe17d4e68 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 8d3c2c1455 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idf67a8446ee389917fc9caa01d37bdcefcd72722
 2021-03-04 07:19:11 +00:00
Hyundo Moon
b7386552e0 Merge "Do not use MediaCommunicationManager below Android S" into sc-dev 2021-03-04 07:07:03 +00:00
Treehugger Robot
b8506650b8 Merge "Remove @hide CollectionUtils in QosCallbackTracker" am: 12acf15141 am: 8397f20aff am: 338c005da1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612296

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib2c4a517556e8fb397dcd64c3f121c90e40bd6d2
 2021-03-04 06:53:18 +00:00
TreeHugger Robot
43ccc03aa0 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-03-04 06:34:33 +00:00
TreeHugger Robot
e721949501 Merge changes from topic "presubmit-am-44f75cc65d6b468cacc9a0b8b8ac0b5e" into sc-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 67a9eecc69
  Import translations. DO NOT MERGE ANYWHERE
 2021-03-04 06:34:31 +00:00
Treehugger Robot
fd426e18cd Merge "Remove unused errorMessage" am: 78a488cd10 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1616687

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c9d4dd0c721c1bb0340e52f4af1c6813efa4ee7
 2021-03-04 06:29:43 +00:00
TreeHugger Robot
8d3c2c1455 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-03-04 06:27:54 +00:00
Treehugger Robot
338c005da1 Merge "Remove @hide CollectionUtils in QosCallbackTracker" am: 12acf15141 am: 8397f20aff 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612296

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8596a13bd869c8b2a26eefc1b8e30e7334b72f98
 2021-03-04 06:11:58 +00:00
Treehugger Robot
78a488cd10 Merge "Remove unused errorMessage" 2021-03-04 06:03:56 +00:00
Curtis Belmonte
02a13d14d5 Merge "Add authenticator-aware string methods to BiometricManager" into sc-dev 2021-03-04 05:42:09 +00:00
Aaron Huang
402f5476fc Merge "Remove PersistableBundle(Bundle) usage from ConnectivityService" am: e32c7c482e am: 3f93679709 am: c7c88b710d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556097

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3f43cf1a8cfd61e6c9467679cd170dfacc70165d
 2021-03-04 05:11:19 +00:00
Paul Hu
40f09de8e6 Merge "Replace ConnectivityManager hidden symbols on framework" am: 1297f90193 am: 0e37e30151 am: 7a35f4b4de 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607955

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifd0d0d57bc74aaf9590dcdd4aa76919da8ccb7d0
 2021-03-04 05:10:48 +00:00
Remi NGUYEN VAN
3c649ed684 Merge "Add Build.IS_DEBUGGABLE to public API" am: 9c16d8e25d am: 739f8a3fb1 am: 043099e934 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397947

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie58769fe349a87152d0b3a23c6e59a9649b49e92
 2021-03-04 05:10:15 +00:00
Sudheer Shanka
45d2dc202e [automerger skipped] Merge "Add new network process capability." am: ae0fa6d359 am: 028e394c23 am: 2640acbea8 -s ours 
am skip reason: Change-Id Ia411ddef2e8cb77d371c22262d5b1e06a0396e29 with SHA-1 2c84695b71 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6c81830f03da5b3c41eae77b82750c4accda7f20
 2021-03-04 05:09:43 +00:00
Treehugger Robot
d8c3bdb09a Merge "Use Log instead of Slog in QosCallbackAgentConnection" am: c0b0157d3e am: a2611c00ca am: 9310d8b56d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614020

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I34b4be8343b0b86569f2ec73817b489aae794d92
 2021-03-04 05:09:17 +00:00
Treehugger Robot
d10c8129a3 Merge "Address comments on aosp/1612040." am: e486d38855 am: eeb8bba5f4 am: f9d49a8a11 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1613962

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1ede7d126fe6a610c9c4c4dc8c631270a599d3cb
 2021-03-04 05:08:52 +00:00
Frank Li
f0c81356f4 Merge "[CS05]Remove the hidden API usage of MetricsLogger" am: 9e79e9d99a am: 8e7a1b38d9 am: 8faf9990e6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612039

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2d784ac885ffcbc7a4539cf6e5b4774af5c11c43
 2021-03-04 05:08:28 +00:00
Automerger Merge Worker
ba2e774597 [automerger skipped] Merge changes from topic "am-76600349da4e4810be01a0dcf115747a" into rvc-qpr-dev-plus-aosp am: 84787d76ee -s ours 
am skip reason: Change-Id Iac1cdd643253fd186a164b863d65d6e92698fd38 with SHA-1 02b4a387aa is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic5f3c369a84617252b71c46c4be1ed5bfcd6047c
 2021-03-04 05:07:34 +00:00
Junyu Lai
ad09f20ed5 Merge "[FUI19] Migrate ConnectivityService to use NetworkStatsManager" am: 7563c45083 am: 013ae86f00 am: 14b3195aa5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560408

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I48c92ae353490c05f1704b010b3c6f25505164c3
 2021-03-04 05:06:53 +00:00
Treehugger Robot
8397f20aff Merge "Remove @hide CollectionUtils in QosCallbackTracker" am: 12acf15141 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612296

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icc65c4fb9c354b00ea98552021860170189ce15c
 2021-03-04 05:02:00 +00:00
Rajeev Kumar
2c293a43a3 Merge changes I0bd9becd,I1f2967dc into sc-dev 
* changes:
  Add new component usage event (2/2)
  Add new component usage event (1/2)
 2021-03-04 04:32:52 +00:00
TreeHugger Robot
073e3dddea [automerger skipped] Merge "Revoke storage on SDK downgrade or new full storage request" into rvc-dev am: b9e15c3f1a -s ours am: 83f12a47be -s ours am: d505cb71a3 -s ours 
am skip reason: Change-Id Ia6bd5658b77a26ab15fea013ec875050457473e0 with SHA-1 b29834bc15 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I501029cb368ab568299e0c4a385a36e66dd2e0f7
 2021-03-04 04:26:16 +00:00
Hall Liu
66fdbb57b5 [automerger skipped] Merge "Allow empty tokens in strict grammar" into rvc-dev am: 5fa6de7421 am: c4c7142216 -s ours 
am skip reason: Change-Id Iac1cdd643253fd186a164b863d65d6e92698fd38 with SHA-1 b7cffcab32 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2644bd66fa481afdc57010eb81222375fa0b9e45
 2021-03-04 04:25:49 +00:00
Hall Liu
23c005c610 [automerger skipped] Merge "Allow empty tokens in strict grammar" into rvc-dev am: c5c9242194 am: d80b097d82 -s ours 
am skip reason: Change-Id Ie82dded77a3eaa75095333b0e77f10e21c9f7caf with SHA-1 a3986a5def is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7ddf2905c4f748c42d710924bdc412564487bb6e
 2021-03-04 04:25:40 +00:00
TreeHugger Robot
9df2d9f6e1 [automerger skipped] Merge "Revoke storage on SDK downgrade or new full storage request" into rvc-dev am: b9e15c3f1a am: b7967ff9a8 -s ours 
am skip reason: Change-Id Ia6bd5658b77a26ab15fea013ec875050457473e0 with SHA-1 b29834bc15 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1f1f52ab994a030ecee23961d1961086ab4d4b7b
 2021-03-04 04:25:15 +00:00
Aaron Huang
c7c88b710d Merge "Remove PersistableBundle(Bundle) usage from ConnectivityService" am: e32c7c482e am: 3f93679709 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556097

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I07b7071eaedad69cac1908a872941a31002cefd0
 2021-03-04 04:23:54 +00:00
Paul Hu
7a35f4b4de Merge "Replace ConnectivityManager hidden symbols on framework" am: 1297f90193 am: 0e37e30151 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607955

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If400965e3260d8d310faee86e4edce4235130553
 2021-03-04 04:23:42 +00:00
Remi NGUYEN VAN
043099e934 Merge "Add Build.IS_DEBUGGABLE to public API" am: 9c16d8e25d am: 739f8a3fb1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397947

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I19e099baa632221842cf1687fbef0bad06fda060
 2021-03-04 04:23:30 +00:00
Sudheer Shanka
2640acbea8 Merge "Add new network process capability." am: ae0fa6d359 am: 028e394c23 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612822

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6894d30d9cc47c3d14596f878b0b91084a4d50e8
 2021-03-04 04:23:15 +00:00
Treehugger Robot
9310d8b56d Merge "Use Log instead of Slog in QosCallbackAgentConnection" am: c0b0157d3e am: a2611c00ca 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614020

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad988b171f6871e728381fa046f03765391bf5fd
 2021-03-04 04:22:51 +00:00
Treehugger Robot
f9d49a8a11 Merge "Address comments on aosp/1612040." am: e486d38855 am: eeb8bba5f4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1613962

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I292f206377968a10052e0759d26819583e164b5a
 2021-03-04 04:22:37 +00:00
Frank Li
8faf9990e6 Merge "[CS05]Remove the hidden API usage of MetricsLogger" am: 9e79e9d99a am: 8e7a1b38d9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612039

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I34df69bec5ee2bab2b8fd4e366f4d3967b471fd5
 2021-03-04 04:22:20 +00:00
Treehugger Robot
12acf15141 Merge "Remove @hide CollectionUtils in QosCallbackTracker" 2021-03-04 04:22:18 +00:00
Automerger Merge Worker
84787d76ee Merge changes from topic "am-76600349da4e4810be01a0dcf115747a" into rvc-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Allow empty tokens in strict grammar" into rvc-dev am: 5fa6de7421 -s ours am: 432bbbcdf2 -s ours
  [automerger skipped] Merge "Allow empty tokens in strict grammar" into rvc-dev am: c5c9242194 -s ours am: e5496f1e73 -s ours
 2021-03-04 04:22:15 +00:00
Junyu Lai
14b3195aa5 Merge "[FUI19] Migrate ConnectivityService to use NetworkStatsManager" am: 7563c45083 am: 013ae86f00 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560408

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic41c4c6c923dea2a21ce7f4602e628743527b735
 2021-03-04 04:22:06 +00:00
Hall Liu
6999f07d39 [automerger skipped] Merge "Allow empty tokens in strict grammar" into rvc-dev am: 5fa6de7421 -s ours am: 432bbbcdf2 -s ours 
am skip reason: Change-Id Iac1cdd643253fd186a164b863d65d6e92698fd38 with SHA-1 b7cffcab32 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1612322519366a0022bdd33def959e6e6c0f86d4
 2021-03-04 04:21:57 +00:00
Hall Liu
6792b73e15 [automerger skipped] Merge "Allow empty tokens in strict grammar" into rvc-dev am: c5c9242194 -s ours am: e5496f1e73 -s ours 
am skip reason: Change-Id Ie82dded77a3eaa75095333b0e77f10e21c9f7caf with SHA-1 a3986a5def is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifcf761e62b7520ec9cf855deb41e45d3fa7ef078
 2021-03-04 04:21:49 +00:00
TreeHugger Robot
d505cb71a3 [automerger skipped] Merge "Revoke storage on SDK downgrade or new full storage request" into rvc-dev am: b9e15c3f1a -s ours am: 83f12a47be -s ours 
am skip reason: Change-Id Ia6bd5658b77a26ab15fea013ec875050457473e0 with SHA-1 b29834bc15 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie52361ab6a08673593d6e56bcad2385f522801c1
 2021-03-04 04:21:01 +00:00
JW Wang
ec5c85d06f Merge "Populate fields for committed staged sessions" into sc-dev 2021-03-04 04:18:00 +00:00
Robert Shih
35dd3d135f Merge "MediaDrm: detailed Exception messages continued" into sc-dev 2021-03-04 04:08:27 +00:00