Commit Graph

556279 Commits

Author SHA1 Message Date
Xin Li
efc2db020a Merge "Skip android11-tests-dev." am: bb12496933 am: d7bb64fffd am: 3666c431c8 am: 9d3a79fd38
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1427572

Change-Id: Id7a2098fa45e5d67bc22ea4cfbfed312433c3478
2020-09-21 20:14:01 +00:00
Xin Li
9d3a79fd38 Merge "Skip android11-tests-dev." am: bb12496933 am: d7bb64fffd am: 3666c431c8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1427572

Change-Id: Ifb20ed6c1bb9b71adc14bcd2a43fd72e75102988
2020-09-21 19:53:18 +00:00
Xin Li
3666c431c8 Merge "Skip android11-tests-dev." am: bb12496933 am: d7bb64fffd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1427572

Change-Id: I2b719aa845044fa41f6eb9e4c7e4dfcd76928313
2020-09-21 19:31:35 +00:00
TreeHugger Robot
1488119306 Merge "Added UserInfo.convertedFromPreCreated" into rvc-qpr-dev am: 7d2354bdc5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12495367

Change-Id: I164ccf69a41291610cf7f87f8cbbb453aa2aba2b
2020-09-21 19:20:55 +00:00
TreeHugger Robot
97a912df3e Merge "Fixed PackageManager.readLPw() call." into rvc-qpr-dev am: 0bf48315b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12594954

Change-Id: I12a88927f75468b8a7cafc412c302aa2953d0aeb
2020-09-21 18:55:27 +00:00
Xin Li
d7bb64fffd Merge "Skip android11-tests-dev." am: bb12496933
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1427572

Change-Id: Id6bf038eec8655ac7daeb6338bd1ab80504b5969
2020-09-21 18:43:17 +00:00
TreeHugger Robot
7d2354bdc5 Merge "Added UserInfo.convertedFromPreCreated" into rvc-qpr-dev 2020-09-21 18:40:48 +00:00
Xin Li
bb12496933 Merge "Skip android11-tests-dev." 2020-09-21 18:25:44 +00:00
TreeHugger Robot
0bf48315b6 Merge "Fixed PackageManager.readLPw() call." into rvc-qpr-dev 2020-09-21 18:16:10 +00:00
TreeHugger Robot
4f8a8f68fd Merge "Media - Leave playing media in QS" into rvc-qpr-dev am: 0766cdc08c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12548203

Change-Id: I26afbb1c8c6c34603d5191a56e3dad6a4fffe4b7
2020-09-21 17:41:17 +00:00
TreeHugger Robot
0766cdc08c Merge "Media - Leave playing media in QS" into rvc-qpr-dev 2020-09-21 16:58:25 +00:00
TreeHugger Robot
e15048a9f2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 0ac5999aa2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaaaba485df107847d3615f6113389bc473ca46b4
2020-09-21 16:22:16 +00:00
TreeHugger Robot
0ac5999aa2 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-09-21 16:09:08 +00:00
Heemin Seog
c8a4022cad Merge "DO NOT MERGE Ensure mapping between internal and public insets" into rvc-qpr-dev am: 3fe532822f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12547244

Change-Id: Ibe6b860ec69664943f5932063b065990f84b0cea
2020-09-21 16:00:49 +00:00
Heemin Seog
9779c9e133 DO NOT MERGE Ensure mapping between internal and public insets am: ae42535e1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12547244

Change-Id: I518091fb946ce0492acbb65396f743f8ca96ae10
2020-09-21 16:00:33 +00:00
Heemin Seog
3fe532822f Merge "DO NOT MERGE Ensure mapping between internal and public insets" into rvc-qpr-dev 2020-09-21 15:35:04 +00:00
Marin Shalamanov
1a6fa2ea72 Merge "Add permission to override display mode requests" am: 7fb5deb779 am: 83a8725d55 am: 794938dfa7 am: 544040036e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420968

Change-Id: I51b0cd00440ee14c6ec07cb5ab209cf5728ae441
2020-09-21 14:12:16 +00:00
TreeHugger Robot
4a6b0e0e7a Merge "Don't trust DozeState onScreenState changes" into rvc-qpr-dev am: 697711df74
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12638390

Change-Id: Ic67de8dd079cd4590057811ba33c309c343dfbc3
2020-09-21 14:05:20 +00:00
Marin Shalamanov
544040036e Merge "Add permission to override display mode requests" am: 7fb5deb779 am: 83a8725d55 am: 794938dfa7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420968

Change-Id: Ic8d98cad7f9c8aed2d967b0959fa0e989a763abb
2020-09-21 13:27:26 +00:00
Bill Yi
bd09f74925 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2b371d33761fd71448a0d7a27efd337b288cfe9f
2020-09-21 06:24:44 -07:00
TreeHugger Robot
697711df74 Merge "Don't trust DozeState onScreenState changes" into rvc-qpr-dev 2020-09-21 13:10:47 +00:00
Marin Shalamanov
794938dfa7 Merge "Add permission to override display mode requests" am: 7fb5deb779 am: 83a8725d55
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420968

Change-Id: I59da44847b84fc262248409dbe8e49c608743886
2020-09-21 13:01:37 +00:00
Marin Shalamanov
83a8725d55 Merge "Add permission to override display mode requests" am: 7fb5deb779
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420968

Change-Id: Ie1abcff2b4a0e3394e7dd4a102790bd74609dfa0
2020-09-21 12:40:50 +00:00
Marin Shalamanov
7fb5deb779 Merge "Add permission to override display mode requests" 2020-09-21 12:23:13 +00:00
Marin Shalamanov
8f2f6d1465 Add permission to override display mode requests
This permission will be used for testing purposes
to override the display mode requests in DisplayModeDirector.

Bug: 159113268
Bug: 158316271
Test: m
Change-Id: Ibcafc50badcda929c3c3b446b6d0d9045c2a5b6d
Merged-In: I257636ae2a6ed74044e71e49a99024682c3a92c5
2020-09-21 14:04:48 +02:00
Amit Mahajan
e2c2376700 [automerger skipped] Merge "Data connection for carrier specific APN" into rvc-qpr-dev am: 2bf86a01a5 -s ours
am skip reason: Change-Id If1e6d2bf58de39c22caa901fcd90fb11f104d900 with SHA-1 115e02818a is in history

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

Change-Id: Ia233f6c141f94deaa71cf53c7f82451963789d88
2020-09-21 06:50:49 +00:00
Charles Chen
23658123e1 Merge "Fix VrDisplayTest failure" into rvc-qpr-dev am: 76fc311541
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12628222

Change-Id: If3a9ee4c37b6f9ecb8f088c228e832a41aea3a9f
2020-09-21 06:33:32 +00:00
Amit Mahajan
2bf86a01a5 Merge "Data connection for carrier specific APN" into rvc-qpr-dev 2020-09-21 06:05:08 +00:00
Charles Chen
76fc311541 Merge "Fix VrDisplayTest failure" into rvc-qpr-dev 2020-09-21 05:59:39 +00:00
TreeHugger Robot
86c3836f4f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4a314719d9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8d3e30b970b68f18cf6b5219afe2a638429bb71f
2020-09-21 04:07:50 +00:00
TreeHugger Robot
4a314719d9 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-09-21 03:40:03 +00:00
Bill Yi
0ab8256173 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia50dec04509df3893aed71f969fcafd7fac73864
2020-09-20 23:15:46 +00:00
Bill Yi
59ec78841d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5835eaa4ab -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib091aa56b1ca52c257e49c68045630a6ef7ea1d2
2020-09-20 18:49:20 +00:00
Bill Yi
5835eaa4ab Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I76c30ebf77794481590e6a9ddb68dfab0899fe67
2020-09-20 15:45:11 +00:00
TreeHugger Robot
0a9ab10b09 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: e58f4913d3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7bbe81643ff255c75d7105afc3a813f1395eb7f7
2020-09-20 07:14:15 +00:00
TreeHugger Robot
e58f4913d3 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-09-20 06:54:21 +00:00
Kai Shi
6b59c16f5d Merge "Bug fix of 6GHz band channelization" into rvc-qpr-dev am: d556312950
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12551035

Change-Id: If597837015595b755ed5f82530384425f3a57c98
2020-09-20 05:35:09 +00:00
Bill Yi
1e7548eb62 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2f0d0d2c4acfeab442b447a3f7313c9f60ac8583
2020-09-19 21:46:40 -07:00
Kai Shi
d556312950 Merge "Bug fix of 6GHz band channelization" into rvc-qpr-dev 2020-09-20 04:19:16 +00:00
Kai Shi
dc0c7a41ea Bug fix of 6GHz band channelization
Move up 6GHz band start and end frequencies by 10MHz per IEEE 802.11ax
draft 7.0 Annex E Table E-4.
Add the special case of 6G band channel 2.

Bug: 167426957
Test: atest android.net.wifi
Test: manual test with 6GHz capable STA and AP
Change-Id: I24c9c4d38c74681cd7318a9b052d9c2cd4ddf87f
Merged-In: I24c9c4d38c74681cd7318a9b052d9c2cd4ddf87f
2020-09-19 23:17:41 +00:00
TreeHugger Robot
0d7d974447 Merge "Add screenshot back to power menu for some devices" into rvc-dev am: 30233e0682 am: ab73ba71fb am: ab64b32360
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12549895

Change-Id: Iad4f3ff055cdc61b37e2b030f030b009664b179e
2020-09-19 11:09:12 +00:00
TreeHugger Robot
27bdd45909 Merge "Add screenshot back to power menu for some devices" into rvc-dev am: 30233e0682 am: da8d0957ae am: 4250e77273
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12549895

Change-Id: Ibeb8c6f6d71723634398dddca35da64740d8dfe9
2020-09-19 11:08:06 +00:00
TreeHugger Robot
0366c4a1cf Merge "Add screenshot back to power menu for some devices" into rvc-dev am: 30233e0682 am: ab73ba71fb am: 6dc916a49d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12549895

Change-Id: I8cf6c0ac4a1d2862cfd96a66af25a2ce21ce0090
2020-09-19 11:07:55 +00:00
TreeHugger Robot
ab64b32360 Merge "Add screenshot back to power menu for some devices" into rvc-dev am: 30233e0682 am: ab73ba71fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12549895

Change-Id: I8c4ad0785cb13e53bc154306ddd43ab8e04f6e05
2020-09-19 10:49:02 +00:00
TreeHugger Robot
4250e77273 Merge "Add screenshot back to power menu for some devices" into rvc-dev am: 30233e0682 am: da8d0957ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12549895

Change-Id: Iafff905c65a0947fa84aa6ae526a0a44f2c3f677
2020-09-19 10:49:01 +00:00
TreeHugger Robot
6dc916a49d Merge "Add screenshot back to power menu for some devices" into rvc-dev am: 30233e0682 am: ab73ba71fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12549895

Change-Id: Idbebc1a6ba29ab7eed0efbeec216b804f8c45a2c
2020-09-19 10:48:33 +00:00
TreeHugger Robot
da8d0957ae Merge "Add screenshot back to power menu for some devices" into rvc-dev am: 30233e0682
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12549895

Change-Id: If297f4d26596b5ab39de94e4c0e76176a3799681
2020-09-19 09:54:18 +00:00
TreeHugger Robot
ab73ba71fb Merge "Add screenshot back to power menu for some devices" into rvc-dev am: 30233e0682
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12549895

Change-Id: Id89eef8efb70c95edfdee5703f0dd3e01b07b47a
2020-09-19 09:53:15 +00:00
TreeHugger Robot
30233e0682 Merge "Add screenshot back to power menu for some devices" into rvc-dev 2020-09-19 09:28:06 +00:00
Treehugger Robot
1d849c8615 Merge "Mark emergency dialer package string as untranslatable." am: 9a4505c4fb am: 635845b15b am: 6f39d5a8c2 am: 0620e03d34
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1430102

Change-Id: Ia050afff141061d17726d3e43d827f8355ab6f22
2020-09-19 09:06:30 +00:00