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

530366 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Garfield Tan
1bb6900a61 Stop keeping freeform activities visible. 
This logic was introduced when there could be multiple tasks in the
freeform stack so it was necessary to keep freeform tasks visible even
when they are not in the front. However right now stack and task are the
same so activities became the children of the original stack, and we
don't have the need to keep activities behind the top activity always
visible.

Bug: 161366153
Bug: 166012554
Bug: 167751180
Test: atest ActivityVisibilityTests#testConvert* on freeform first
      devices.
Change-Id: Ibeeba5ca8b6b60583eec9cbee9b7209ee17b1037
Merged-In: Ibeeba5ca8b6b60583eec9cbee9b7209ee17b1037
 2020-10-07 10:43:04 -07:00
TreeHugger Robot
9e0859b765 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 2943d70788 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I498fde935ed482f1ca23a5d59106db74c1e5f7fc
 2020-10-07 16:55:31 +00:00
TreeHugger Robot
9339405d43 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b3cbc66070 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I03a30296c345b03579ddc823e77329e3439c12f4
 2020-10-07 16:55:01 +00:00
TreeHugger Robot
2943d70788 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-10-07 15:57:40 +00:00
TreeHugger Robot
b3cbc66070 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-10-07 15:54:38 +00:00
TreeHugger Robot
70517ab022 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: cfe0491c27 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6d43d953eccaa78a34bf74c384874d227a1e818e
 2020-10-07 14:46:34 +00:00
David Su
752cb249a6 RESTRICT AUTOMERGE Implement sendBroadcastAsUserMultiplePermissions in BridgeContext. 
sendBroadcastAsUserMultiplePermissions was added to Context.java.
Implementing in BridgeContext.

Fix oc-dev since BridgeContext is in frameworks/base/tools/layoutlib,
whereas in later branches the file is in frameworks/layoutlib

Test: Compile / build (actual usage is documented in other bugs)
Bug: 159373687
Change-Id: I8715b6fce7039268eb29914cb15f68ab922f4d3f
Merged-In: I857ea00cc58a0abbb77960643f361dd6dd9c8b56
 2020-10-07 14:41:24 +00:00
TreeHugger Robot
cfe0491c27 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-10-07 14:41:19 +00:00
TreeHugger Robot
5d29c1510b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: aabad94a4d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6e56f3f71c87e38ab5a0f2158085193cc7c31812
 2020-10-07 14:36:05 +00:00
TreeHugger Robot
5e3cda6760 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 0609e2b01d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie9c9198b08f164bc16189738c571ab359bc048f1
 2020-10-07 14:35:18 +00:00
TreeHugger Robot
aabad94a4d Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-10-07 14:26:24 +00:00
TreeHugger Robot
0609e2b01d Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-10-07 14:20:52 +00:00
Anton Hansson
c3ef1f564f Add last_released checking for module-lib API too 
I missed this in If608be48276f0a7f76afd714656267ed379ce062, which added
last_released tracking to the other *-non-updatable APIs. See that
change for more context.

Bug: 170105267
Test: m checkapi
Change-Id: I32d09c7fc155c04295dc16028a568e3381c09e4b
 2020-10-07 14:57:40 +01:00
Bill Yi
5581023158 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0e349a495a3642ec1d3830bff526ed25001f9f75
 2020-10-07 04:54:22 -07:00
Anton Hansson
a07b8d4e93 Merge "Add genrule for combined-removed-dex" am: b0ba7618c8 am: dd7eb2b019 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1446678

Change-Id: I93de42fc706d521307b7cf08ac328b182131a542
 2020-10-07 10:18:32 +00:00
Mark Chien
17c2040532 Merge "Make the IP subnet persistent till reboot" am: 818da784dd am: fabe5787f0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432958

Change-Id: Ib0d9e5b21b88fd352b06b3064ef3c34de4c046ce
 2020-10-07 10:18:00 +00:00
Anton Hansson
dd7eb2b019 Merge "Add genrule for combined-removed-dex" am: b0ba7618c8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1446678

Change-Id: If74e60e3b97c22bdeb32e59b56c9476e6adf64fb
 2020-10-07 10:00:18 +00:00
Mark Chien
fabe5787f0 Merge "Make the IP subnet persistent till reboot" am: 818da784dd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432958

Change-Id: I0aaa978e8edd7e8666413fb18352fa83e9fb5469
 2020-10-07 09:55:29 +00:00
Anton Hansson
b0ba7618c8 Merge "Add genrule for combined-removed-dex" 2020-10-07 09:54:43 +00:00
Chiachang Wang
50d0fa47ee Merge "Update to positive logic to better match the method naming" am: 1c7bc039ea am: a7136c6340 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450336

Change-Id: I6e823ac8769864d9a1bfd6d675331d4b683da331
 2020-10-07 09:50:45 +00:00
Chiachang Wang
c65f31e0db Merge "Prevent going through unnecessary networks" am: 836af202e0 am: 7039b0ca8a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1436691

Change-Id: Ic09b161eeff7203c9516b3fc803df6b8deacd010
 2020-10-07 09:48:32 +00:00
David Su
5ddf8dd40a [automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev am: d1bcf628bd am: 60cf3eebd5 -s ours am: 615d6b6ba6 -s ours am: aeac5e7d30 -s ours am: 5c2b86fbed -s ours am: 4c94806e28 -s ours am: 008d947b59 -s ours am: 81e1bdcb6f -s ours 
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 ea7ef4ad2a is in history

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

Change-Id: I31474e5b0a894300ea0dc5fa18c87bdf2f8d1f18
 2020-10-07 09:47:10 +00:00
Mark Chien
818da784dd Merge "Make the IP subnet persistent till reboot" 2020-10-07 09:39:29 +00:00
Bill Yi
45889f6edb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I14c04e0e9b99c8227a12a9e49cf0c8e28f92c0f7
 2020-10-07 02:38:30 -07:00
David Su
81e1bdcb6f [automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev am: d1bcf628bd am: 60cf3eebd5 -s ours am: 615d6b6ba6 -s ours am: aeac5e7d30 -s ours am: 5c2b86fbed -s ours am: 4c94806e28 -s ours am: 008d947b59 -s ours 
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 ea7ef4ad2a is in history

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

Change-Id: I85509e7b2ad905c15e7280bf2d6b57c02ea068fb
 2020-10-07 09:34:40 +00:00
Chiachang Wang
a7136c6340 Merge "Update to positive logic to better match the method naming" am: 1c7bc039ea 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450336

Change-Id: Ib01ae19fb846fdd75cf792e85dc1776a4a6876ee
 2020-10-07 09:22:49 +00:00
Chiachang Wang
7039b0ca8a Merge "Prevent going through unnecessary networks" am: 836af202e0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1436691

Change-Id: I7e7603f416202a387804a7060e6b1d62ce81c6bd
 2020-10-07 09:19:35 +00:00
David Su
008d947b59 [automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev am: d1bcf628bd am: 60cf3eebd5 -s ours am: 615d6b6ba6 -s ours am: aeac5e7d30 -s ours am: 5c2b86fbed -s ours am: 4c94806e28 -s ours 
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 ea7ef4ad2a is in history

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

Change-Id: If5edb76ce859af8506a381856c6b3b0058aee541
 2020-10-07 09:18:41 +00:00
David Su
4c94806e28 [automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev am: d1bcf628bd am: 60cf3eebd5 -s ours am: 615d6b6ba6 -s ours am: aeac5e7d30 -s ours am: 5c2b86fbed -s ours 
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 ea7ef4ad2a is in history

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

Change-Id: Id637abc5705e488e2bc77122e052b9d3ea475ae3
 2020-10-07 08:32:52 +00:00
Chiachang Wang
1c7bc039ea Merge "Update to positive logic to better match the method naming" 2020-10-07 08:21:32 +00:00
Chiachang Wang
836af202e0 Merge "Prevent going through unnecessary networks" 2020-10-07 08:21:04 +00:00
David Su
5c2b86fbed [automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev am: d1bcf628bd am: 60cf3eebd5 -s ours am: 615d6b6ba6 -s ours am: aeac5e7d30 -s ours 
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 ea7ef4ad2a is in history

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

Change-Id: Ic97189261040a3eef447064ceed038727fb11120
 2020-10-07 08:16:39 +00:00
Hai Zhang
74a162c7b9 Merge "Add myself to system server permission code OWNERS." am: 1839f9f7f8 am: be5c84157b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450996

Change-Id: I9f32642be1caa0271f1838a74f65b9c00462ba4f
 2020-10-07 08:09:51 +00:00
Bill Yi
0e9f763902 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib6f49cca9040a04e24c3477ee6779e78d4e09dae
 2020-10-07 01:07:58 -07:00
Hai Zhang
be5c84157b Merge "Add myself to system server permission code OWNERS." am: 1839f9f7f8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450996

Change-Id: I03d973e7b7aad386a55e9bff35577711293411ad
 2020-10-07 08:00:38 +00:00
David Su
aeac5e7d30 [automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev am: d1bcf628bd am: 60cf3eebd5 -s ours am: 615d6b6ba6 -s ours 
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 ea7ef4ad2a is in history

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

Change-Id: I7bedb3b7b8da1bdbe3f483b5186d7864ffc22f7a
 2020-10-07 07:58:20 +00:00
Paul Hu
ea51bc5a51 Merge "Make PendingIntent immutable" am: bbab1d3b4f am: 09448f961c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450495

Change-Id: I62d89704634f015bc17247819af8212c7bc08ec3
 2020-10-07 07:52:40 +00:00
TreeHugger Robot
7a11b64a09 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 9ade8130a6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I09015d5734c7aecd37c6803f5954d4b4d0622af0
 2020-10-07 07:52:22 +00:00
David Su
0bf831141b [automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-mr1-dev am: 3d92e370f5 -s ours am: 8a936e088d -s ours am: b9edc63f80 -s ours am: 79148d590a -s ours am: 3c8124a242 -s ours am: 63549d1837 -s ours 
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 f955e56d51 is in history

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

Change-Id: I4fe6fa8db34677b9f7b03338f6d26fcfaf69280d
 2020-10-07 07:48:55 +00:00
wilsonshih
a4f3ed14d5 Make WallpaperMS bind wallpaper component PendingIntent immutable. am: b392903052 am: f75396d3c6 am: 286aa8b9b4 am: 7e53b78946 am: 7e24456d17 am: c201373d98 am: 46bdd4af42 am: 5d67607771 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12718696

Change-Id: I706d3002c96cdb55e48fb2fc31334d7a352859e3
 2020-10-07 07:48:20 +00:00
wilsonshih
43e56f6ad8 Make WallpaperMS bind wallpaper component PendingIntent immutable. am: 178da54fc9 am: 6ea3559233 am: 5b295c7726 am: b3fd083cb1 am: 254924da94 am: b180f6990a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12718925

Change-Id: Iffc161ee8da16e9b61246d4c9274e330b98748c6
 2020-10-07 07:48:09 +00:00
Automerger Merge Worker
b1549f3d31 Merge "Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into pi-dev am: 416332cf90" into qt-dev am: 2426f27569 am: 8a6fa4c1eb am: 75b7643622 am: 3120bcd10d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12715966

Change-Id: Ib578f1656e41abdefe72ecec39c064eb84f6cfac
 2020-10-07 07:47:57 +00:00
Nathan Harold
e4d4916078 [automerger skipped] Merge "[DO NOT MERGE][BACKPORT]Improve location checks in TelephonyRegistry" into qt-dev am: 0b5b9eed4b am: e45ec287ed -s ours am: 94e5401f7e -s ours am: 96631660af -s ours 
am skip reason: Change-Id I8caa3ea409836ce8469d8d8210b481a0284594f2 with SHA-1 cc584e777d is in history

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

Change-Id: I4da51f8fad76a3c6dc10b261a957b9298ff49483
 2020-10-07 07:47:25 +00:00
Nathan Harold
606869a99c [automerger skipped] [DO NOT MERGE][BACKPORT]Improve location checks in TelephonyRegistry am: 81bab8b849 am: e1a23c7ef6 -s ours am: d5bb499052 -s ours am: d76e095bc3 -s ours 
am skip reason: Change-Id I8caa3ea409836ce8469d8d8210b481a0284594f2 with SHA-1 cc584e777d is in history

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

Change-Id: Ie6d13af002f0c62ec6b6753d0711bb9404359809
 2020-10-07 07:47:15 +00:00
Paul Hu
09448f961c Merge "Make PendingIntent immutable" am: bbab1d3b4f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450495

Change-Id: Id8b270aaf94b322aca0338a25d2bada9d2699169
 2020-10-07 07:46:21 +00:00
David Su
615d6b6ba6 [automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev am: d1bcf628bd am: 60cf3eebd5 -s ours 
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 ea7ef4ad2a is in history

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

Change-Id: If0bd01e56bc171cf50e01443bdac78bc149dd64b
 2020-10-07 07:44:33 +00:00
Bill Yi
a225200fc2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5990ede7dab666583341bc53e143a5037301dbc6
 2020-10-07 00:22:18 -07:00
TreeHugger Robot
9ade8130a6 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-10-07 07:07:04 +00:00
Chiachang Wang
8c1372ed1d Update to positive logic to better match the method naming 
The method checkInterfacePresent seems that should return if the
interface is present or not, but it actually return an opposite
result. It may confuse the caller. E.g. The override method in
VpnTest assume it always returns true in the test. It will fail
the vpn start flow due to interface gone.

Bug: 169215213
Test: atest FrameworksNetTess
Change-Id: I3e9a64f0900336b8205674b94db68f090b4e9ff9
 2020-10-07 06:48:15 +00:00
Bill Yi
77dad9481e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If70f12909df07fd6fd1eb9f9bd5686599385e171
 2020-10-06 23:36:32 -07:00