Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
495,114 Commits 3 Branches 0 Tags
32b4fb1be7906731c38e52e5f88f13b818c65104
Commit Graph

495114 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
32b4fb1be7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I21c1b6c5b721b174f07532c8e19ad446d4639eed
 2020-08-06 16:37:38 +00:00
Bill Yi
160db07b3b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c710e6f333 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I68c3f4c059f4b634cf92551e7f98107959aecccd
 2020-08-04 23:30:10 +00:00
TreeHugger Robot
e2a535da8a Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-08-04 22:01:51 +00:00
Bill Yi
18c29901f7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I941ab074bfc175558112212e52a798ec1c836546
 2020-08-04 20:53:56 +00:00
Bill Yi
c710e6f333 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I42d66695970ff56f25e2074b30a1bcdfe3eece9f
 2020-08-04 20:17:08 +00:00
Fabian Kozynski
cc514fd00d Merge "Guard against NPE" into rvc-qpr-dev 2020-08-04 17:33:47 +00:00
Colin Cross
1ed9a7feb1 Merge "Use -target 8 for android_uiautomator" into rvc-dev am: 48666a1abb am: a5498a5d70 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12297232

Change-Id: Ic24765977f54fa9c4cb2974ea149c3f899fa4c3c
 2020-08-04 16:57:07 +00:00
Colin Cross
a5498a5d70 Merge "Use -target 8 for android_uiautomator" into rvc-dev am: 48666a1abb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12297232

Change-Id: I241b4c142fb46364b85066948fa65ee6f9d5b25f
 2020-08-04 16:46:11 +00:00
Colin Cross
48666a1abb Merge "Use -target 8 for android_uiautomator" into rvc-dev 2020-08-04 16:30:51 +00:00
Josh Tsuji
9020ed08e1 Merge "Remember the stack position, including across configuration changes." into rvc-qpr-dev 2020-08-04 15:17:30 +00:00
Alan Stokes
56dc3f4122 Merge "Don't include inaccessible data dirs in library paths." into rvc-qpr-dev 2020-08-04 07:56:42 +00:00
Dave Mankoff
b20a507711 Merge "Alert ProxCheck listeners directly when timing out." into rvc-d1-dev am: 350583bea0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12294057

Change-Id: Ifd4b2e396bcc1164f2e63bcfbba5565255b5a4dc
 2020-08-04 01:09:05 +00:00
Colin Cross
51387a027d Use -target 8 for android_uiautomator 
android_uiautomator is distributed as part of the SDK and should use
-target 8 for compatibility with old JDKs.

Bug: 150153790
Bug: 162522383
Test: javap -v -cp out/target/common/obj/JAVA_LIBRARIES/android_uiautomator_intermediates/classes.jar com.android.uiautomator.core.Configurator | grep "major version"
Change-Id: I6871ab5436232ad3bffff6bd26adf2de6b3c06ff
 2020-08-03 18:03:40 -07:00
Dave Mankoff
350583bea0 Merge "Alert ProxCheck listeners directly when timing out." into rvc-d1-dev 2020-08-04 00:43:07 +00:00
Roshan Pius
b2c8cb2a53 Merge "Revert "Revert "SystemServer: Dynamically load wifi-service"" into rvc-qpr-dev 2020-08-04 00:26:24 +00:00
Kevin Hufnagle
e500a9f38b Merge "docs: Changes "their" to "the" in 2 places" into rvc-dev am: 24ed56bd0c am: b4937f485e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12286685

Change-Id: I034901e5722e469498fd6c871de294edbb466a6e
 2020-08-03 23:02:59 +00:00
Kevin Hufnagle
b4937f485e Merge "docs: Changes "their" to "the" in 2 places" into rvc-dev am: 24ed56bd0c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12286685

Change-Id: I8d018f90219ac8461f5b15f16d35e9159278d1cf
 2020-08-03 22:51:22 +00:00
Kevin Hufnagle
24ed56bd0c Merge "docs: Changes "their" to "the" in 2 places" into rvc-dev 2020-08-03 22:26:36 +00:00
TreeHugger Robot
7bb01c843d [automerger skipped] Merge "Add missing isShellUser check" into qt-qpr1-dev am: 998144cf5e -s ours am: 2c2e9f1f4a -s ours am: f80ba3a9f8 -s ours 
am skip reason: Change-Id I23bb06e00f1623e4f27c02d7eb2c0d273b40771b with SHA-1 80a9cce44b is in history

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

Change-Id: I9dc9e9237f6023830089ccfc587d9bc7933a8bb8
 2020-08-03 22:14:09 +00:00
TreeHugger Robot
45e1c0131b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: dd2e7d498d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If98296691c49a35bda0a87b97d2c6211509af5cc
 2020-08-03 22:14:00 +00:00
TreeHugger Robot
1dd578655e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: fefff3a690 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I091f37576b159b219fe0c4c8e70e6f5c5ed08949
 2020-08-03 22:13:23 +00:00
TreeHugger Robot
7fdea5141f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: f5a667e787 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1e1f85e0e5171ff965c7d5a10c0e83b20e0cd66c
 2020-08-03 22:12:35 +00:00
TreeHugger Robot
f80ba3a9f8 [automerger skipped] Merge "Add missing isShellUser check" into qt-qpr1-dev am: 998144cf5e -s ours am: 2c2e9f1f4a -s ours 
am skip reason: Change-Id I23bb06e00f1623e4f27c02d7eb2c0d273b40771b with SHA-1 80a9cce44b is in history

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

Change-Id: Ie9ff8d6aedfa9249dde7e4e02ca24a54da41ef32
 2020-08-03 22:12:20 +00:00
TreeHugger Robot
dd2e7d498d Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-03 22:07:18 +00:00
TreeHugger Robot
fefff3a690 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-03 21:58:10 +00:00
TreeHugger Robot
f5a667e787 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-03 21:54:17 +00:00
TreeHugger Robot
2c2e9f1f4a [automerger skipped] Merge "Add missing isShellUser check" into qt-qpr1-dev am: 998144cf5e -s ours 
am skip reason: Change-Id I23bb06e00f1623e4f27c02d7eb2c0d273b40771b with SHA-1 80a9cce44b is in history

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

Change-Id: I658c8e6ee3ed8027bef54e7499b4cf84426273c3
 2020-08-03 21:49:18 +00:00
TreeHugger Robot
ed19995508 [automerger skipped] Merge "Add missing isShellUser check" into qt-dev am: 8416431f37 am: ee7692c239 -s ours am: 3786221350 -s ours am: 917fa69690 -s ours 
am skip reason: Change-Id I23bb06e00f1623e4f27c02d7eb2c0d273b40771b with SHA-1 bfdb7121ef is in history

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

Change-Id: If0f493e4a30d796dd61c7840d1946d4346f4bf8a
 2020-08-03 21:37:07 +00:00
Eugene Susla
08ec7a316d Fix duplicate devices when multiple mediums scanning requested am: b8b53f3b39 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12295535

Change-Id: Ib79a52ee96c9a386a5efd6446cf3594ea3d62b65
 2020-08-03 21:36:41 +00:00
TreeHugger Robot
917fa69690 [automerger skipped] Merge "Add missing isShellUser check" into qt-dev am: 8416431f37 am: ee7692c239 -s ours am: 3786221350 -s ours 
am skip reason: Change-Id I23bb06e00f1623e4f27c02d7eb2c0d273b40771b with SHA-1 bfdb7121ef is in history

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

Change-Id: I7a97fb3c18012567ce7fc94be042329b4f18e8f5
 2020-08-03 21:25:41 +00:00
TreeHugger Robot
998144cf5e Merge "Add missing isShellUser check" into qt-qpr1-dev 2020-08-03 21:22:31 +00:00
TreeHugger Robot
3786221350 [automerger skipped] Merge "Add missing isShellUser check" into qt-dev am: 8416431f37 am: ee7692c239 -s ours 
am skip reason: Change-Id I23bb06e00f1623e4f27c02d7eb2c0d273b40771b with SHA-1 bfdb7121ef is in history

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

Change-Id: I0689df03f62b8ce269a436388ca1b0072800bdca
 2020-08-03 21:12:11 +00:00
TreeHugger Robot
ee7692c239 Merge "Add missing isShellUser check" into qt-dev am: 8416431f37 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12171286

Change-Id: I45f0fa7f6d99d1bf7572aa53f084115a1cb920e5
 2020-08-03 20:59:18 +00:00
TreeHugger Robot
8416431f37 Merge "Add missing isShellUser check" into qt-dev 2020-08-03 20:24:27 +00:00
Dave Mankoff
06d38cabf6 Alert ProxCheck listeners directly when timing out. 
Before this change, we were relying on the ProximitySensor class
to circle back and tell the ProximityCheck class about null results.
When the ProximitySensor class changed, this broke ProxCheck. The
ProxCheck class now directly alerts its listeners when it times out.

A test has been added to cover this case now.

Fixes: 162205584
Test: atest SystemUiTests && Manual
Change-Id: Ie48589a54daae3e29defde9ed2300f3c7e2b88ae
 2020-08-03 16:04:29 -04:00
Bill Yi
3850645278 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2a99dee33597c248107fb59e3ee8033f87562c92
 2020-08-03 20:03:11 +00:00
Nate Jiang
2bbbe141ef Merge "DO NOT MERGE Revert "[NetworkSuggestion] Fix getEnterpriseConfig"" into rvc-qpr-dev 2020-08-03 19:46:33 +00:00
TreeHugger Robot
786165bae0 Merge "Don't clone the locale redundantly in Configuration.setTo()" into rvc-qpr-dev 2020-08-03 18:42:10 +00:00
Eugene Susla
b8b53f3b39 Fix duplicate devices when multiple mediums scanning requested 
The dedupuing logic was already in place, but there was a race
due to managin the list of devices from different threads.

Test: using wear app ensure dup device reproduses without CL, and not with it
Fixes: 160870456
Change-Id: I1526199e8e4fb4b8f7d7f306e9e676359cdca516
 2020-08-03 18:40:04 +00:00
Bill Yi
077e548c04 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I552123f2a9c207d66dd7d255ea45f5219bdf4b2e
 2020-08-03 18:16:02 +00:00
Bill Yi
e78fbde299 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8bcfdc018522b2796193f24f40ce33c6fc11639a
 2020-08-03 17:53:36 +00:00
Roshan Pius
2c17b6690f Revert "Revert "SystemServer: Dynamically load wifi-service" 
Revert submission 10144846-revert-10103769-load_wifi_service_dynamically-XZNQJHXURR

Reason for revert: Changes in build system to store uncompressed and aligned DEX files for java libs in APEXes.

Reverted Changes:
Icc0b680c2: Revert "SystemServer: Dynamically load wifi-servic...
I83a2f93e3: Revert "product: Remove wifi-service off SystemSer...


Bug: 148099857
Bug: 162371380
Bug: 162746981
Test: Compiles
Change-Id: I6c3f36873cae476dc76fd353d20fb6bd2c177f0b
 2020-08-03 17:27:26 +00:00
Nate Jiang
f570f1bdcc DO NOT MERGE Revert "[NetworkSuggestion] Fix getEnterpriseConfig" 
This reverts commit a03bcee783.

Reason for revert: failing test because prebuild module
Bug: 162724237

Change-Id: I530123295c3366a6955076e9d9e031282c70c486
 2020-08-03 16:57:21 +00:00
TreeHugger Robot
c7bacdca44 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: afab5784ea -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iacbd4aea3355c2792c807c4c93d49b9ce5c40db8
 2020-08-03 16:29:40 +00:00
TreeHugger Robot
afab5784ea Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-03 16:05:18 +00:00
Julia Reynolds
dbbf77f98a Merge "Allow more concurrent notifications" into rvc-qpr-dev 2020-08-03 14:42:15 +00:00
Wei Sheng Shih
712847301b Merge "Prevent sleep tokens from being created recursively." into rvc-qpr-dev 2020-08-03 14:01:52 +00:00
Bill Yi
c29772ff25 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3616e004f367d066ae865ed3a5d56b0be7f09862
 2020-08-03 10:54:56 +00:00
Bill Yi
f1578647ed [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 04d03a3606 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic267d327b7fd0eaeffe6cc026ca8d032ad340082
 2020-08-03 05:09:55 +00:00
Bill Yi
04d03a3606 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id80ea2167494900f57296f60329f582303f398fc
 2020-08-02 20:06:12 +00:00