Commit Graph

559515 Commits

Author SHA1 Message Date
Benjamin Schwartz
754d78cb7d Merge "BatteryStatsService: Allow unknown wakeup string" 2021-01-06 17:28:21 +00:00
James Mattis
3b75f7a8e9 Merge "Update to Diagnostic Callback flows for multilayer" 2021-01-06 15:25:56 +00:00
Lorenzo Colitti
91348d9f22 Merge "Migrate away from AsyncChannel in NetworkAgent" 2021-01-06 14:10:21 +00:00
Bill Yi
e4b09fd3dd Merge "Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE" 2021-01-06 13:58:58 +00:00
Treehugger Robot
b59598f790 Merge "Add WM owners to the OWNERS of the related core tests" 2021-01-06 12:27:13 +00:00
Treehugger Robot
916dfddfd0 Merge "Change log tag of DynamicSystemClient to match class name" 2021-01-06 11:11:58 +00:00
Rhed Jao
9ca3672319 Merge changes I5e1802c5,I4542568f,I99a052d7,Iae89206d,Ie955266a
* changes:
  Returns immediately if the bugreport file already exists
  Fixes an error handling in BugreportProgressService
  Fixes BugreportReceiverTest failed
  Fix BugreportReceiverTest
  Do not buzzing for each progress of bugreport notification
2021-01-06 10:41:13 +00:00
Neil Fuller
8bdd40d2e5 Merge "Add an OWNERS file for location tz detection code" 2021-01-06 10:05:26 +00:00
Yunfan Chen
87efb59f2b Add WM owners to the OWNERS of the related core tests
Update the OWNERS in core tests to let WM OWNERS own the related tests.

Test: Presubmit
Change-Id: Ib4de6fb3bc523dbe8c7418e76de255a11a6bde66
2021-01-06 18:19:12 +09:00
Yo Chiang
4896c7f2ac Merge "DynamicSystemInstallationService: Support remount for DSU guest system" 2021-01-06 08:37:43 +00:00
Yo Chiang
cd65cd4e04 Change log tag of DynamicSystemClient to match class name
Expand the "DynSystem" abbreviation to "DynamicSystem".
For simpler log grepping.

Bug: 165471299
Test: No
Change-Id: Ibec692ae45539dacd55e13ffaa903b58f3bf0417
2021-01-06 08:24:16 +00:00
Bill Yi
2dcac1e2a1 Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE
Merged-In: I034d45f1afcdd07c0b12e2db7e4134b695ec5c70
Change-Id: I329407db7c9ed7d2b512e505df6e50c4f471fafa
2021-01-05 18:27:51 -08:00
Shuo Qian
bfd05221a3 Merge "Add CAPABILITY_TYPE_CALL_COMPOSER in MmTelFeature" 2021-01-06 00:48:00 +00:00
Shuo Qian
4260bc4f95 Merge "Add Call Composer Carrier Config keys" 2021-01-06 00:48:00 +00:00
Shuo Qian
a4524a936a Merge "Add call composer Extras for enriched calling" 2021-01-06 00:48:00 +00:00
Shuo Qian
b31c9b4702 Merge "Add CAPABILITY_CALL_COMPOSER in PhoneAccount for enriched calling." 2021-01-06 00:48:00 +00:00
Shuo Qian
6e419a49a7 Merge "Add Call Composer API extras in TelecomManager" 2021-01-06 00:48:00 +00:00
Daniel Bright
1948c69946 Merge changes from topics "apn_throttle", "rename_retry_interval"
* changes:
  Add apn throttle status notifications to QNS
  Renamed retry interval to retry duration
2021-01-06 00:43:25 +00:00
Treehugger Robot
30841f177c Merge "Keystore 2.0: Android Protected Confirmation" 2021-01-05 23:29:35 +00:00
Jeff Sharkey
7f2de331ac Merge "Update OWNERS for ServiceWatcher" 2021-01-05 23:24:46 +00:00
Soonil Nagarkar
321c014cea Update OWNERS for ServiceWatcher
Change-Id: I43f3f2f59a401afd6aa95e162ff29d2b15c42c52
2021-01-05 15:19:41 -08:00
Treehugger Robot
6efe7e60e5 Merge "Add OWNERS file for assist structure test" 2021-01-05 22:36:13 +00:00
vichang
4eb4e375f7 Merge "Deprecate Patterns.IP_ADDRESS" 2021-01-05 22:18:48 +00:00
Daniel Bright
cc7c94c433 Merge "Add callSessionIntiating + callSessionInitatingFailed" 2021-01-05 21:55:59 +00:00
David Su
1569abf4bb Merge "frameworks/base/wifi: Add MOVED.txt" 2021-01-05 21:48:24 +00:00
Treehugger Robot
9d396145ef Merge "Add key layout and device file for Reference RCU" 2021-01-05 21:39:05 +00:00
Jeff Sharkey
9193da7db1 Merge "Fix OWNERS for graphics" 2021-01-05 21:22:56 +00:00
John Reck
97dd9f1623 Fix OWNERS for graphics
core/java/android/graphics doesn't exist, so neither
does core/android/graphics/OWNERS

Fix the include path to point to the graphics source of truth
as /graphics/java/android/graphics/OWNERS

Test: this
Change-Id: I5a1e6edbc82df5e3b2979753a6d7329707c55d88
2021-01-05 16:05:50 -05:00
Neil Fuller
c7ff097409 Add an OWNERS file for location tz detection code
Another OWNERS file for location tz detection code.

Test: treehugger only
Change-Id: I47066218e126cb087c449f08fc4ab2fe72a1d298
2021-01-05 20:46:39 +00:00
Etan Cohen
a8cc70b502 Merge "Grant shell permissions for Airplane Mode to Shell to support CTS" 2021-01-05 19:45:21 +00:00
Daniel Bright
f2f714a0dc Add apn throttle status notifications to QNS
* Added wiring for the apn unthrottled indication
* Added method to QNS that is notified when there is a change to
  the way an APN is throttled.

Test: Ran telephony tests
Test: Booted up device
Test: Checked for log message in
      NetworkAvailabilityProvider#onReportApnThrottleStatusChanged
Bug: 167434852
Bug: 174850845
Merged-In: Ia4dd3036f583a97e42b6054019005df1b33dc33c
Change-Id: Ia4dd3036f583a97e42b6054019005df1b33dc33c
2021-01-05 11:36:34 -08:00
David Su
e3d6713d1e frameworks/base/wifi: Add MOVED.txt
Document where the files have been moved to.

Bug: 137323948
Test: compiles
Change-Id: Ib1a017a71c265eba00eae44663fd225ce1bec0f8
2021-01-05 19:20:59 +00:00
Jack Yu
133b7dc759 Renamed retry interval to retry duration
Fix: 171981823
Test: FrameworksTelephonyTests
Merged-In: I7c4bbe0a77301761525ae793892bb811637027b5
Change-Id: I7c4bbe0a77301761525ae793892bb811637027b5
2021-01-05 11:01:26 -08:00
Steven Moreland
e51328b36c Merge "TransactionTooLargeException: doc clarification" 2021-01-05 18:32:33 +00:00
Max Zhang
c8ae8840a9 Add key layout and device file for Reference RCU
Adding key layout and device configuration file
for Google Reference RCU.
The VID/PID pair used in file name is speicifically for
Reference RCU, which supports both G10 and G20.

b/173100313
test: manually on custom build for ADT-3

Change-Id: I2048012fb91adfc6a2f61065ba262d5ed344c673
2021-01-05 18:24:49 +00:00
Jeff Sharkey
1050d7b88c Merge "Add SystemUI owners NotificationHeaderView and NotificationTopLineView" 2021-01-05 17:03:47 +00:00
Jeff Sharkey
7f4ff741f6 Merge "Adding OWNERS file" 2021-01-05 17:02:11 +00:00
Beth Thibodeau
4b6f151ba1 Adding OWNERS file
Test: verified other file exists, no code changes

Change-Id: I0019f4ce29016a633c8ee2faa48bba4a37585f6d
2021-01-05 11:55:44 -05:00
Jeff Sharkey
7283ceda9b Merge "Update OWNERS for NetInitiatedActivity.java" 2021-01-05 16:40:01 +00:00
Jeff Sharkey
e4401ef4c5 Merge "Add OWNERS file for people" 2021-01-05 16:06:23 +00:00
Julia Reynolds
96ca797192 Add OWNERS file for people
Change-Id: I2024258217dcff3dcc34d5dc7bc2d56010e47be1
2021-01-05 16:04:30 +00:00
Treehugger Robot
281c972290 Merge "Add an OWNERS file for location tz detection code" 2021-01-05 12:19:11 +00:00
Corina Grigoras
d09e92e5d2 Merge "Log at debug level when things are OK" 2021-01-05 11:11:54 +00:00
Corina Grigoras
bf2043a138 Log at debug level when things are OK
StorageManagerService: android.os.ServiceSpecificException is expected if the user has not unlocked the device.

Bug: 151077642
Bug: 174442693
Change-Id: I07b06cd6f7cff4529cba46aa4e3dcf7b0ee8dfa5
Test: No
Merged-In: I027250bcae132d9be9c16690478adb41467bfec4
2021-01-05 11:09:10 +00:00
Yo Chiang
848bcdc42a DynamicSystemInstallationService: Support remount for DSU guest system
DSU service would try to install a DSU scratch partition if host system
is debuggable.
If the scratch partition failed to install, then skip installing
scratch, as remount support should be optional.
Otherwise if the guest system is non-debuggable, then the scratch
partition would be ignored by guest, which is harmless.
Otherwise the guest system is debuggable, which means the guest system
would be able to do adb remount.

Relax partition allocation status polling rate from 10ms -> 100ms,
because there's no point polling faster than the screen framerate.

Bug: 165925766
Test: TH
Test: Install a DSU system on a debuggable host, reboot into the guest
  system, and guest system can remount.
Change-Id: I9a8255483cc963ebcf7a2909e68ac69371cb369f
2021-01-05 15:38:42 +08:00
Yo Chiang
d15cbc37d5 Merge "Update OWNERS file for DynamicSystemInstallationService related files" 2021-01-05 03:34:39 +00:00
Etan Cohen
ddb4902597 Grant shell permissions for Airplane Mode to Shell to support CTS
New permission is needed to allow CTS to trigger the new WiFi subsystem
restart API.

Bug: 175084231
Test: atest android.net.wifi.cts.WifiManagerTest#testRestartWifiSubsystem
Change-Id: Id844fb799c61f65580e686d1da7ec38a62dd01d0
2021-01-02 22:34:50 -08:00
Treehugger Robot
e4f60f7dff Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-01-02 07:32:31 +00:00
Treehugger Robot
fd89d91847 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-01-02 07:31:51 +00:00
Bill Yi
a111adcf57 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2c6caefa550e2466ec206a12a5733885a2e0979d
2021-01-02 06:32:28 +00:00