Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
556,261 Commits 3 Branches 0 Tags
c8a4022cad4cbccd780e43d25463bae4b69fd428
Commit Graph

556261 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Amit Mahajan
f593fe9b17 [automerger skipped] Merge "Data connection for carrier specific APN" am: 47a1e949c3 am: ba9b991631 am: eb10ff679b -s ours am: 3ede3f3039 -s ours 
am skip reason: Change-Id If1e6d2bf58de39c22caa901fcd90fb11f104d900 with SHA-1 115e02818a is in history

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

Change-Id: I82f9425108e0066afd466fc432a734b51047f03f
 2020-09-19 08:34:07 +00:00
Brad Ebinger
f18a386742 Merge "Fix a typo in service class" am: 7b38b459f3 am: 7420236576 am: 55895d9414 am: 454939b8b5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1429089

Change-Id: I8cd1f04ad605b092b36c2882235e95293b265c91
 2020-09-19 08:07:59 +00:00
Bill Yi
91d42c5efc [automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: e935e010b3 am: 2075ab0f01 -s ours am: 1de555b1a3 -s ours am: f7b9efeff8 -s ours 
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history

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

Change-Id: I908bcb9330b0e2cf00374276e1d8e5fa3fc67fab
 2020-09-19 08:02:00 +00:00
Bill Yi
d84f8c4443 [automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 5b49c68d11 am: 1848cf03d8 -s ours am: 847cfb2230 -s ours am: c0977118e6 -s ours 
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history

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

Change-Id: I53f6598e1a8f06322ee1ec7f5c5979d2ab01c05b
 2020-09-19 08:01:04 +00:00
Treehugger Robot
0620e03d34 Merge "Mark emergency dialer package string as untranslatable." am: 9a4505c4fb am: 635845b15b am: 6f39d5a8c2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1430102

Change-Id: If9140b35302ac550c03b93e04786f04fa968b7b9
 2020-09-19 07:16:33 +00:00
Treehugger Robot
6f39d5a8c2 Merge "Mark emergency dialer package string as untranslatable." am: 9a4505c4fb am: 635845b15b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1430102

Change-Id: Ida845bd34807653bc791389f60cef7bad7ed5bc4
 2020-09-19 07:08:06 +00:00
Amit Mahajan
3ede3f3039 [automerger skipped] Merge "Data connection for carrier specific APN" am: 47a1e949c3 am: ba9b991631 am: eb10ff679b -s ours 
am skip reason: Change-Id If1e6d2bf58de39c22caa901fcd90fb11f104d900 with SHA-1 115e02818a is in history

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

Change-Id: I2290055eea0c8fdcb4f9ba6471f3ed18f09ede23
 2020-09-19 07:05:33 +00:00
Brad Ebinger
454939b8b5 Merge "Fix a typo in service class" am: 7b38b459f3 am: 7420236576 am: 55895d9414 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1429089

Change-Id: I7025ec64f5c9ddb747d9b872304c083a83c6118c
 2020-09-19 07:05:08 +00:00
Bill Yi
f7b9efeff8 [automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: e935e010b3 am: 2075ab0f01 -s ours am: 1de555b1a3 -s ours 
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history

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

Change-Id: I18f6dabacb6e272e2d3fdf63a9220afc5572f2d2
 2020-09-19 07:01:25 +00:00
Bill Yi
c0977118e6 [automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 5b49c68d11 am: 1848cf03d8 -s ours am: 847cfb2230 -s ours 
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history

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

Change-Id: Ib3e8b5c0678513b5128aaf106c8f8044bed09702
 2020-09-19 07:00:58 +00:00
Amit Mahajan
eb10ff679b Merge "Data connection for carrier specific APN" am: 47a1e949c3 am: ba9b991631 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1238996

Change-Id: I5186d773ee3952cee516ac0ccb473352ca847ad9
 2020-09-19 06:57:45 +00:00
Brad Ebinger
55895d9414 Merge "Fix a typo in service class" am: 7b38b459f3 am: 7420236576 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1429089

Change-Id: I44f67a3658ab2d0649f509634afae355f5e2c36e
 2020-09-19 06:09:52 +00:00
Bill Yi
1de555b1a3 [automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: e935e010b3 am: 2075ab0f01 -s ours 
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history

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

Change-Id: I2ad75dfe2a2109ea63eade0ed3edc40b92149a16
 2020-09-19 05:51:33 +00:00
Bill Yi
847cfb2230 [automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 5b49c68d11 am: 1848cf03d8 -s ours 
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history

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

Change-Id: I4a14d0f2ef305f4f564e7e38134763a85fd09ad3
 2020-09-19 05:50:36 +00:00