Linus Tufvesson
2e33ba4687
Update javadoc for setLaunchDisplayId am: 334190f26e am: c37e102250
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12794770
Change-Id: I3d140d6f77e5600179f20fd84031e0a2c389b3ed
2020-10-09 21:42:02 +00:00
Linus Tufvesson
c37e102250
Update javadoc for setLaunchDisplayId am: 334190f26e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12794770
Change-Id: I44386a01dea9e2102c3b2e5f8ecbbf59f2ad8c48
2020-10-09 21:14:59 +00:00
TreeHugger Robot
18ec4996af
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 0f7bf3b718 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12803306
Change-Id: I53295ff35b93b6c2f8f888b302e0e08b6e00676d
2020-10-09 18:08:13 +00:00
TreeHugger Robot
0f7bf3b718
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2020-10-09 18:05:37 +00:00
Tyler Gunn
0b22366dc7
Merge "Add clarification text on getCallerNumberVerificationStatus docs." am: f83bccb02f am: 793b248026
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1455218
Change-Id: Ie2f31334928f716e3bb1b337081fd5b8af83ab9b
2020-10-09 18:03:34 +00:00
Tyler Gunn
793b248026
Merge "Add clarification text on getCallerNumberVerificationStatus docs." am: f83bccb02f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1455218
Change-Id: I8bc01c2775f368ed335ae28bba7faa5dbcb36e74
2020-10-09 17:33:48 +00:00
Treehugger Robot
a95dc0e13f
Merge "Fix non-inclusive terms in framework device policy logic" am: 64add27a7c am: 3d3e16e2a6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1454737
Change-Id: I4a64cac98249a47797d2b3c4f937559f4f681261
2020-10-09 17:19:43 +00:00
Tyler Gunn
f83bccb02f
Merge "Add clarification text on getCallerNumberVerificationStatus docs."
2020-10-09 17:07:40 +00:00
Treehugger Robot
3d3e16e2a6
Merge "Fix non-inclusive terms in framework device policy logic" am: 64add27a7c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1454737
Change-Id: I4ed8efb69d82984868f382807290993878eb134f
2020-10-09 16:42:41 +00:00
Treehugger Robot
64add27a7c
Merge "Fix non-inclusive terms in framework device policy logic"
2020-10-09 16:19:46 +00:00
Bill Yi
ecc8711fee
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2ddc22f4062a8057de6e38852532d594b5e360c8
2020-10-09 08:45:18 -07:00
Alison Cichowlas
dcd9e4e8bb
Merge "Fix handling of bad image previews." am: 9e388035c9 am: 737107bb76
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1455516
Change-Id: I202699d551709473b18621ee7cb0af2731dfb704
2020-10-09 14:43:02 +00:00
Alison Cichowlas
737107bb76
Merge "Fix handling of bad image previews." am: 9e388035c9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1455516
Change-Id: I56d8c73381d357b76928519b2d50f56e7ba3a931
2020-10-09 14:02:27 +00:00
Anton Hansson
ae4332dc69
Move the dist rules from monolithic to merged rules
...
These API tracking files are identical except for 2 inlined permission
constants in the public API, which do not matter.
```
@@ -31606 +31606 @@
- method @Deprecated @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", "android.permission.NETWORK_SETUP_WIZARD"}) public java.util.List<android.net.wifi.hotspot2.PasspointConfiguration> getPasspointConfigurations();
+ method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.List<android.net.wifi.hotspot2.PasspointConfiguration> getPasspointConfigurations();
@@ -31634 +31634 @@
- method @Deprecated @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", "android.permission.NETWORK_CARRIER_PROVISIONING"}) public void removePasspointConfiguration(String);
+ method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_CARRIER_PROVISIONING}) public void removePasspointConfiguration(String);
```
Bug: 158465496
Test: lunch sdk_phone_armv7 ; m sdk dist ; diff artifacts
Change-Id: Ibde9310bb1f5c0921962c022e158a861b233f6d1
2020-10-09 14:45:24 +01:00
Alison Cichowlas
9e388035c9
Merge "Fix handling of bad image previews."
2020-10-09 13:35:43 +00:00
TreeHugger Robot
858fe168ed
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: dae77669aa -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12801147
Change-Id: Icd0b37cccc71c28d31d42ffc847ede4986ab5145
2020-10-09 13:32:32 +00:00
TreeHugger Robot
dae77669aa
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2020-10-09 13:17:48 +00:00
Treehugger Robot
c9f402b6a3
Merge "Don't let NAW.mNetworkInfo escape" am: 60b3b9e7a3 am: 24f5bae9c0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1455976
Change-Id: I8a9899d9a5d7eba8423cbba99f085174ae383e6a
2020-10-09 11:05:01 +00:00
Treehugger Robot
24f5bae9c0
Merge "Don't let NAW.mNetworkInfo escape" am: 60b3b9e7a3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1455976
Change-Id: I01ef40f341c653a524ee4565c3d9bf2564e0f98f
2020-10-09 10:48:42 +00:00
Treehugger Robot
60b3b9e7a3
Merge "Don't let NAW.mNetworkInfo escape"
2020-10-09 10:33:47 +00:00
Linus Tufvesson
334190f26e
Update javadoc for setLaunchDisplayId
...
.. to match behavior post I1f9662c2bd14b34e00fbc8ebb926538f0329c37a
Bug: 167593637
Test: Javadoc change only.
Change-Id: I4cb9fe4a5ae74b1474f9da39b6aeb3a374f8cf12
2020-10-09 09:54:40 +00:00
Artem Radchenko
f763938cec
Fix guest icon is not clickable after adding user
...
When addUser icon is clicked, it becomes disabled to prevent double clicking.
And this icon is newer enabled again in case of successfull user creation.
When user is added, icon for New user is added to recycler view before guest icon.
So, when user selection is opened again guest icon is not clickable, because it is disabled.
Enabling addUser button after successfull user creation fixes this issue.
Test: - Set pin: adb shell locksettings set-pin 0000
- Lock board: adb shell input keyevent KEYCODE_POWER
- Wake up: adb shell input keyevent KEYCODE_POWER
- Click cancel button
- Click "Add User" -> Click Ok
- Set pin
- Lock board
- Wake up
- Click cancel button
- Click guest button
Bug: 170382676
Signed-off-by: Artem Radchenko <artem.radchenko@globallogic.com >
Change-Id: Ie9f3e9b765123207d1217ae2434608c3316923f4
2020-10-09 09:22:53 +00:00
Chalard Jean
6d5e944ba5
Don't let NAW.mNetworkInfo escape
...
Thankfully this has no users.
This agent needs to be migrated to the modern API for
NetworkAgent, which does not have NetworkInfo at all
so this would be a hindrance
Test: FrameworksNetTests NetworkStackTests
Change-Id: I091a6ca8cdf18860f23832ae1008fa02cf0472e8
2020-10-09 17:06:30 +09:00
Bill Yi
b153dc2773
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia2e390f1856f0591d79e87614f859c51dc1acdf4
2020-10-08 23:36:23 -07:00
TreeHugger Robot
838bc9752b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 1015bae311 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12796397
Change-Id: I1e4b9417576bc43f497632ca7e3fd94f028a49c1
2020-10-09 03:48:29 +00:00
Treehugger Robot
7f963de1d7
Merge "IdleMaint: run IdleMaint if battery is charging" am: 8f7a935713 am: 775aeb22d2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1453295
Change-Id: I7626a12f055c9bb2c91a8406db4581a82dd53ba9
2020-10-09 03:48:09 +00:00
TreeHugger Robot
1015bae311
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2020-10-09 03:46:07 +00:00
Treehugger Robot
775aeb22d2
Merge "IdleMaint: run IdleMaint if battery is charging" am: 8f7a935713
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1453295
Change-Id: Ic2ebeaf579d075d7fd93e9236f38da48147a6173
2020-10-09 03:22:18 +00:00
Treehugger Robot
8f7a935713
Merge "IdleMaint: run IdleMaint if battery is charging"
2020-10-09 02:38:23 +00:00
Benedict Wong
beae539cbf
Create VCN subdirectories and add relevant owners
...
This change simply sets up owners files in VCN subdirectories
Bug: 163431877
Test: No code changes; compiles.
Change-Id: I01f40bf75911592bab709d3ce070fb86ef270fe8
2020-10-08 18:39:45 -07:00
Remi NGUYEN VAN
e55c9f1335
Merge "Move IpUtils to frameworks/libs/net" am: e842db3548 am: 62e99304d6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440234
Change-Id: I03872655d1ef3a7bb436666196ed67bd61601f65
2020-10-09 00:52:31 +00:00
Hall Liu
b86d64eac6
Add READ_PRIVILEGED_PHONE_STATE to TestApi
...
Add READ_PRIVILEGED_PHONE_STATE to TestApi in order to support
SplitPermissionsSystemTest.
Bug: 156297292
Test: atest SplitPermissionsSystemTest
Merged-In: I67520ba9f8bf25b759f6552a332bdebf67f4c7e6
Change-Id: I67520ba9f8bf25b759f6552a332bdebf67f4c7e6
2020-10-08 17:47:49 -07:00
Remi NGUYEN VAN
62e99304d6
Merge "Move IpUtils to frameworks/libs/net" am: e842db3548
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440234
Change-Id: Ibd41a02a9a185667a7fe332213ef692c4d8bf515
2020-10-09 00:30:36 +00:00
Jaegeuk Kim
1b81f01259
IdleMaint: run IdleMaint if battery is charging
...
We've got reports where this ate battery too much during 3 to 4 AM.
Bug: 168083554
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com >
Change-Id: I8f41a8922034d3d625b90f70a523155d7f1c51e4
2020-10-08 17:14:59 -07:00
Remi NGUYEN VAN
e842db3548
Merge "Move IpUtils to frameworks/libs/net"
2020-10-09 00:13:40 +00:00
Treehugger Robot
aed2f3e749
Merge "Add BinderCacheManager: caches Binder & notifies listeners upon death" am: 1083b7ed57 am: 98e157c405
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1455085
Change-Id: I54e9f7bdf6a3beee8387402c21ebbd581c67ba1b
2020-10-08 23:32:50 +00:00
Bill Yi
a2bf6f721a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifd0ce6d2535ef6da70dd2093ce81e5d5e578a5f3
2020-10-08 16:18:19 -07:00
Treehugger Robot
98e157c405
Merge "Add BinderCacheManager: caches Binder & notifies listeners upon death" am: 1083b7ed57
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1455085
Change-Id: I66697a231e712e3e0e3cb7ff3d9ecd8de2720133
2020-10-08 23:14:59 +00:00
Treehugger Robot
1083b7ed57
Merge "Add BinderCacheManager: caches Binder & notifies listeners upon death"
2020-10-08 22:59:11 +00:00
Brian Stack
246d438d6c
Merge "Add UwbManager API Stubs" am: 2c48ea2f87 am: 4980bde1e2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1453876
Change-Id: I0e0dab787154ed0ebbbec84a8dfd618056919db9
2020-10-08 22:45:18 +00:00
Brian Stack
4980bde1e2
Merge "Add UwbManager API Stubs" am: 2c48ea2f87
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1453876
Change-Id: Ibc82e7a64f70efd15c6b969a3967863e0ca68135
2020-10-08 22:11:21 +00:00
Brian Stack
2c48ea2f87
Merge "Add UwbManager API Stubs"
2020-10-08 21:53:49 +00:00
Patrick Baumann
318ffcb05e
Merge "Handling removing <original-package> tag" am: e682158745 am: 62964d830c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1455087
Change-Id: I9e64ba8bd7da087d4bc8f11567e830f876138a7b
2020-10-08 21:47:25 +00:00
Patrick Baumann
62964d830c
Merge "Handling removing <original-package> tag" am: e682158745
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1455087
Change-Id: I20e0937247244ca8f1bb788ca41f12acc0073fee
2020-10-08 21:20:11 +00:00
Alison Cichowlas
446548446a
Fix handling of bad image previews.
...
When the image preview fails (eg for permissions or timeout) the entire
system area is removed. This prevents the user from using Nearby.
Instead, when the image preview fails, we should hide only the image
preview and leave the rest of the system area intact.
Bug: 168557188
Test: ChooserActivityTest; manual inspection
Change-Id: I49190c1fbc4e25b3d2e2802a90de355bff297f7e
Merged-In: I49190c1fbc4e25b3d2e2802a90de355bff297f7e
2020-10-08 21:03:14 +00:00
Patrick Baumann
e682158745
Merge "Handling removing <original-package> tag"
2020-10-08 20:46:37 +00:00
Tyler Gunn
9c64249ea2
Add clarification text on getCallerNumberVerificationStatus docs.
...
Update API docs to make it clear what the verification status means and how
it can be used by CallScreeningService and CallRedirecitonService
implementations.
Test: Build API docs and view offline.
Bug: 150343312
Change-Id: I56f92f5e3ab544e31337a8147134baac33bb4ea9
2020-10-08 13:37:03 -07:00
Brad Ebinger
eb0737961d
Add BinderCacheManager: caches Binder & notifies listeners upon death
...
Adds a BinderCacheManager class, which does the following:
1) Manages a cached Binder node and recreates it when the Binder node dies.
2) Allows Runnables to be associated with the cached Binder,
which will be called when the node dies.
3) Associates the Runnable with an Object key, which can be used to
remove the runnable without needing to keep a separate map
of Object->Runnable pairs when the user unregisters a persistent
listener.
Test: atest CtsTelephonyTestCases FrameworksTelephonyTests:BinderCacheManagerTest
Change-Id: I23a97371435b7aca8153a30997b91bd324a781a0
2020-10-08 13:19:28 -07:00
Brad Ebinger
c7101dbee9
Merge "Fix un-dismissable incoming call for auto-rejected calls" am: dd27d93ad6 am: 98da2d69ee
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1443535
Change-Id: Ib16541a2680990408c209264a3816ad6c0f77702
2020-10-08 19:00:53 +00:00
Brian Stack
0b216e365c
Add UwbManager API Stubs
...
Adds the initial API stubs for checking a device's Ultra Wideband
capabilities.
Bug: 170323306
Test: Builds
Change-Id: I6bd58a5fcee1deb151f2120ad3b18f5f7554ae8f
2020-10-08 11:51:36 -07:00