Commit Graph

68008 Commits

Author SHA1 Message Date
Joshua Duong
228ea7817a Merge "Reread the tls port on adbd restarts." into rvc-dev am: 9e7a8c853c am: 9fc04c68ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11829829

Change-Id: Idf5a228c15b4accc68cf967945e2523efc415e57
2020-06-11 17:55:24 +00:00
Joshua Duong
9fc04c68ee Merge "Reread the tls port on adbd restarts." into rvc-dev am: 9e7a8c853c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11829829

Change-Id: I821c9590a01c4890ba9e5967dcdc5bd92fd5ec1a
2020-06-11 17:36:49 +00:00
Joshua Duong
9e7a8c853c Merge "Reread the tls port on adbd restarts." into rvc-dev 2020-06-11 17:23:00 +00:00
TreeHugger Robot
4f41951082 Merge "Remove package name from the attribution tag." into rvc-dev am: c30e39377a am: e7a2e51536
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689596

Change-Id: I051db54881f9366c87a506e35577be72c6f2befb
2020-06-11 13:58:09 +00:00
TreeHugger Robot
e7a2e51536 Merge "Remove package name from the attribution tag." into rvc-dev am: c30e39377a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689596

Change-Id: I27696e948a2ee563bb5c5bc9dbbf39c0a8f9786d
2020-06-11 13:44:55 +00:00
TreeHugger Robot
c30e39377a Merge "Remove package name from the attribution tag." into rvc-dev 2020-06-11 13:28:03 +00:00
Chalard Jean
1044bfb929 Merge "Document the limitation to a hundred callbacks." am: 0f3e06a1fa am: 79d15abe06 am: 4e33955a47
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313813

Change-Id: Ie9f8c65c307cbefb6e95ec0d3099e5da875ff1c2
2020-06-11 13:16:54 +00:00
Chalard Jean
4e33955a47 Merge "Document the limitation to a hundred callbacks." am: 0f3e06a1fa am: 79d15abe06
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313813

Change-Id: I84b1e39503feddc914b61d4e8bd35953e92ac270
2020-06-11 13:03:37 +00:00
Jorim Jaggi
a7379b4f05 Merge "Exclude non-observable insets change" into rvc-dev am: 1f6b99d5fa am: 6255421565
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11592755

Change-Id: I9ad1d8e08b0b3eab2bf554ba9f6e136b20613ea1
2020-06-11 12:45:39 +00:00
Jorim Jaggi
3f04cf23f4 Merge "Exclude non-observable insets change" into rvc-dev am: 1f6b99d5fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11592755

Change-Id: I095d445a6ed391c2519fbd73a899813c6c17d9e4
2020-06-11 12:31:30 +00:00
Jorim Jaggi
6255421565 Merge "Exclude non-observable insets change" into rvc-dev am: 1f6b99d5fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11592755

Change-Id: I63a484ff464ee0d2ccf733a6512a901ade8fe3a0
2020-06-11 12:31:11 +00:00
Chalard Jean
c022b0c7ea Document the limitation to a hundred callbacks.
Some developers have been surprised by this limitation and had trouble
figuring out what the issue was. Add documentation to address this.

This also includes a drive-by removal of a duplicate check.

Bug: 149867479
Test: doc-only change
Change-Id: I5911d01984695550b6c9afe7a8eb535bf5e320a1
2020-06-11 12:30:21 +00:00
Jorim Jaggi
1f6b99d5fa Merge "Exclude non-observable insets change" into rvc-dev 2020-06-11 12:15:49 +00:00
Kyunglyul Hyun
ddaece61e6 Merge "Add address to MediaRoute2Info" into rvc-dev am: 55e5ac8fc0 am: 60031d4eb4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11822778

Change-Id: Ibdfef9c860ff413e90bffb291f454ade16693000
2020-06-11 11:10:49 +00:00
Issei Suzuki
bb7f58e988 Merge "Fix unexpected closure of the bubble." into rvc-dev am: e3defa2d40 am: 07610a2900
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818615

Change-Id: Id84947b8335952327b2d22d1185f6d445a61e0d7
2020-06-11 11:10:24 +00:00
Kyunglyul Hyun
dbc57de074 Merge "Add address to MediaRoute2Info" into rvc-dev am: 55e5ac8fc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11822778

Change-Id: Ic6ce7e7ea90f6d1fe4e7003286a4b646c681f104
2020-06-11 10:56:33 +00:00
Issei Suzuki
07610a2900 Merge "Fix unexpected closure of the bubble." into rvc-dev am: e3defa2d40
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818615

Change-Id: I3a92fee8c24336eb96fc39f6fb03ca64c5a742ba
2020-06-11 10:56:06 +00:00
Kyunglyul Hyun
60031d4eb4 Merge "Add address to MediaRoute2Info" into rvc-dev am: 55e5ac8fc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11822778

Change-Id: I01d880fb5fa471b6b7e80cb97906dede5c43d4b4
2020-06-11 10:56:05 +00:00
Issei Suzuki
79591d107c Merge "Fix unexpected closure of the bubble." into rvc-dev am: e3defa2d40
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818615

Change-Id: I193580dd53479477345e4ea3cd54dbb7be27cb3b
2020-06-11 10:55:36 +00:00
Kyunglyul Hyun
55e5ac8fc0 Merge "Add address to MediaRoute2Info" into rvc-dev 2020-06-11 10:53:55 +00:00
Issei Suzuki
e3defa2d40 Merge "Fix unexpected closure of the bubble." into rvc-dev 2020-06-11 10:39:16 +00:00
TreeHugger Robot
0d3d5902a8 Merge "trigger file removal when slice permission is removed" into rvc-dev am: 9c90811d29 am: 5b4d89043e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11827756

Change-Id: I2ff89ce3dd50d684607976a8b23f8b93de2e665d
2020-06-11 01:30:48 +00:00
TreeHugger Robot
71bf14f0f1 Merge "trigger file removal when slice permission is removed" into rvc-dev am: 9c90811d29
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11827756

Change-Id: Ib5c8d91eefe1779d75b0899804aba9b6fa8e65b8
2020-06-11 01:22:52 +00:00
TreeHugger Robot
5b4d89043e Merge "trigger file removal when slice permission is removed" into rvc-dev am: 9c90811d29
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11827756

Change-Id: Ia44608fe42e6c201b945556101498cbbb24b3339
2020-06-11 01:22:02 +00:00
TreeHugger Robot
9c90811d29 Merge "trigger file removal when slice permission is removed" into rvc-dev 2020-06-11 01:17:29 +00:00
TreeHugger Robot
1831016ee1 Merge "Throw XmlParserException when client tag cannot be found when parsing slice permissions." into rvc-dev am: 4a487001b7 am: 13817fcbf4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11827755

Change-Id: Idaf285373bfcd88270ea5968158699195eab356a
2020-06-11 01:05:49 +00:00
TreeHugger Robot
008693d402 Merge "Convert personal app suspension on COMP->COPE migration" into rvc-dev am: b14310b5ef am: 50c1b54d3c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11744198

Change-Id: Ieba904d267a6205db099a7cede0027b0d6e130a9
2020-06-11 01:05:27 +00:00
TreeHugger Robot
76c3782d1f Merge "Throw XmlParserException when client tag cannot be found when parsing slice permissions." into rvc-dev am: 4a487001b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11827755

Change-Id: Ic45793b1b9c08acb01f46ca880652428f6377fcf
2020-06-11 00:59:37 +00:00
TreeHugger Robot
13817fcbf4 Merge "Throw XmlParserException when client tag cannot be found when parsing slice permissions." into rvc-dev am: 4a487001b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11827755

Change-Id: I62b7c336eae3cb50acd2a6e5bd251248b64315c7
2020-06-11 00:59:29 +00:00
TreeHugger Robot
4a487001b7 Merge "Throw XmlParserException when client tag cannot be found when parsing slice permissions." into rvc-dev 2020-06-11 00:55:38 +00:00
TreeHugger Robot
4743563b7b Merge "Convert personal app suspension on COMP->COPE migration" into rvc-dev am: b14310b5ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11744198

Change-Id: I54e6bd47de0df42ead548704fad103b210eff2bd
2020-06-11 00:53:00 +00:00
TreeHugger Robot
50c1b54d3c Merge "Convert personal app suspension on COMP->COPE migration" into rvc-dev am: b14310b5ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11744198

Change-Id: I631bd2dc6eb0b9b2ec74770735f6413e098d6223
2020-06-11 00:52:57 +00:00
TreeHugger Robot
b14310b5ef Merge "Convert personal app suspension on COMP->COPE migration" into rvc-dev 2020-06-11 00:40:28 +00:00
TreeHugger Robot
4f735ddbb2 Merge "Suez: Implement display wake reason stats" into rvc-dev am: 7e1c2173a3 am: 67f13fd3e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817919

Change-Id: Ife004618ed8d0b289e197062f1e12be8a1e01396
2020-06-11 00:28:15 +00:00
TreeHugger Robot
67f13fd3e6 Merge "Suez: Implement display wake reason stats" into rvc-dev am: 7e1c2173a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817919

Change-Id: I1a71fe9fb7c533d03ebe2a3b57c3cceda4be6659
2020-06-11 00:23:03 +00:00
TreeHugger Robot
aa00103ee6 Merge "Suez: Implement display wake reason stats" into rvc-dev am: 7e1c2173a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817919

Change-Id: I983da81834ddd3d2cd3528e87edcf475317def73
2020-06-11 00:22:54 +00:00
TreeHugger Robot
7e1c2173a3 Merge "Suez: Implement display wake reason stats" into rvc-dev 2020-06-11 00:21:17 +00:00
Joshua Duong
8ee00491ac Reread the tls port on adbd restarts.
When adbd restarts while wireless debugging is enabled, the port number
may change.

Bug: 158219145

Test: Manual.
1) Enable wireless debugging in Settings and validate port in UI via
> adb shell su 0 netstat -plnt | grep LISTEN
2) Restart adbd: > adb root
3) validate port again (may have changed)

Change-Id: I2b646a61eff417f6bc53018ffbe1f7243981d745
2020-06-10 16:43:14 -07:00
Pinyao Ting
21fc24d092 trigger file removal when slice permission is removed
Bug: 157938808
Test: atest SlicePermissionManageTest
Change-Id: Ie1f2148c926a72837abb05730e712521e5671d66
2020-06-10 16:21:44 -07:00
Pinyao Ting
427f4f67a7 Throw XmlParserException when client tag cannot be found when parsing
slice permissions.

There are three call-sites of SliceClientPermissions#createFrom:
1) SlicePermissionManager#writeBackup and
SlicePermissionManager#readRestore ensures the client tag exists before
calling SliceClientPermissions#createFrom.
2) SlicePermissionManager#getClient is expecting Exception from
SliceClientPermissions#createFrom when it fails to parse the xml, and
creates clean permission object accordingly. This CL ensures an
exception was thrown when the xml parsing cannot be completed.

Bug: 121144871
Test: run test suite in forrest
frameworks/base/services/tests/uiservicestests/src/com/android/server/slice

Change-Id: Id7a239f16b95d16ba17bf651d474dec86492ef47
2020-06-10 16:01:57 -07:00
Pavel Grafov
80b763830e Convert personal app suspension on COMP->COPE migration
* if no apps are suspended by the DO prior to migration, nothing
  changes
* if some apps were suspended by the DO and the DPC targets R+
  via DPM.setPackagesSuspended(), this will result in personal
  apps suspended explicitly by the PO DPC as if it called
  DPM.setPersonalAppsSuspended(). The apps will stay suspended.
* if the DPC target SDK is below R, the apps will be unsuspended
  because the DPC won't have a way to unsuspend them. And the
  user will be stuck with suspended apps.

+ when unsuspending apps, don't collect the list of apps subject
  to suspension, but rather unsuspend all that is suspended. It
  is more robust, e.g. when some app stops meeting the
  conditions, e.g. not SMS app anymore.

Bug: 157270093
Test: com.android.server.devicepolicy.DevicePolicyManagerServiceMigrationTest
Test: Manual, with TestDPC, also patching it to target R

Change-Id: I1eba7216dd557c94bef822b77d25b484dfcd6f63
2020-06-10 23:11:01 +01:00
Josh Gao
0fd4aaddb5 Merge "Let confirmation dialog can appear" am: c98338dec0 am: edcbeec0fb am: bab92cb55d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1326491

Change-Id: Id1858af680aca35b00ea0eac4ec4f42edc03a665
2020-06-10 21:44:13 +00:00
Josh Gao
bab92cb55d Merge "Let confirmation dialog can appear" am: c98338dec0 am: edcbeec0fb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1326491

Change-Id: I5709bfc67adc3875382bae33cc0512762cbdc315
2020-06-10 21:26:31 +00:00
TreeHugger Robot
d8c0ef8cca Merge "Fix original-package support" into rvc-dev am: ab6c4a7685 am: a556600544
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11794000

Change-Id: Ie2cc061e22de86d2862c762c29ee405f8e54a1f9
2020-06-10 21:01:57 +00:00
TreeHugger Robot
05f76520d2 Merge "Fix original-package support" into rvc-dev am: ab6c4a7685
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11794000

Change-Id: I2c7470c868f7729267edc02a5db10bec8ce83c70
2020-06-10 20:56:51 +00:00
TreeHugger Robot
a556600544 Merge "Fix original-package support" into rvc-dev am: ab6c4a7685
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11794000

Change-Id: I7ab69373ebfc4041d92a47fd40829e8032b7e431
2020-06-10 20:56:36 +00:00
Josh Gao
c98338dec0 Merge "Let confirmation dialog can appear" 2020-06-10 20:53:34 +00:00
TreeHugger Robot
ab6c4a7685 Merge "Fix original-package support" into rvc-dev 2020-06-10 20:51:39 +00:00
TreeHugger Robot
a4891c01f6 Merge "Added an event before clearning user journey" into rvc-dev am: 15f86c346a am: 94517f6578
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11812814

Change-Id: Id8de314ea93955a59442faf1e1e2b8be32dd2e13
2020-06-10 20:51:39 +00:00
TreeHugger Robot
94517f6578 Merge "Added an event before clearning user journey" into rvc-dev am: 15f86c346a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11812814

Change-Id: I384fe10f0413ee93e0ec103a300933d8dd14ff61
2020-06-10 20:50:31 +00:00