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

556226 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Treehugger Robot
635845b15b Merge "Mark emergency dialer package string as untranslatable." am: 9a4505c4fb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1430102

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

Change-Id: Iefc784867da56b9ac0acfe0ac3744da9a3625a14
 2020-09-19 05:37:38 +00:00
Brad Ebinger
7420236576 Merge "Fix a typo in service class" am: 7b38b459f3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1429089

Change-Id: I72ee0311a6a0f63d6b7a7d3375ac03254302fb62
 2020-09-19 05:30:38 +00:00
Bill Yi
2075ab0f01 Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: e935e010b3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515

Change-Id: Iaa631aaca21a51d786f59801d317f27ee635c70f
 2020-09-19 05:25:29 +00:00
Bill Yi
1848cf03d8 Merge mainline-release 6664920 to master - DO NOT MERGE am: 5b49c68d11 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515

Change-Id: Id233d0d39ad2d63ae3e6d6128b631e149f68990e
 2020-09-19 05:22:39 +00:00
Treehugger Robot
9a4505c4fb Merge "Mark emergency dialer package string as untranslatable." 2020-09-18 21:11:57 +00:00
TreeHugger Robot
74606dde25 Merge "Only filter when remote session has associated notification" into rvc-qpr-dev am: c6095a415b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12640464

Change-Id: Ic6e4a3d164bbe0e4585f8e74f863057034fb76f2
 2020-09-18 20:17:32 +00:00
Brad Ebinger
64fda3af13 [automerger skipped] Merge "Customize the service class for Call barring" into rvc-qpr-dev am: 3d81f3e80c -s ours 
am skip reason: Change-Id Ibce22d0d340ce648c0b6df411266d1c4fe537013 with SHA-1 03a1471e1e is in history

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

Change-Id: Iae9ab523e7d6b82a8ca6997f5d3d01d9b170ee69
 2020-09-18 20:16:12 +00:00
Amit Mahajan
47a1e949c3 Merge "Data connection for carrier specific APN" 2020-09-18 20:05:25 +00:00
TreeHugger Robot
c6095a415b Merge "Only filter when remote session has associated notification" into rvc-qpr-dev 2020-09-18 19:52:51 +00:00
Brad Ebinger
3d81f3e80c Merge "Customize the service class for Call barring" into rvc-qpr-dev 2020-09-18 19:17:12 +00:00
Brad Ebinger
7b38b459f3 Merge "Fix a typo in service class" 2020-09-18 18:58:10 +00:00
TreeHugger Robot
77735acd49 Merge "Filter out notif updates based on active media session" into rvc-qpr-dev am: fe614e0738 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12597957

Change-Id: Ie3e9aa3ac3ed0ebfeb383a5037ffd2f4c5ae3fe4
 2020-09-18 18:56:41 +00:00
Robert Snoeberger
3dca24f6b8 Only filter when remote session has associated notification 
Bug: 167706409
Test: manual - Cast from Google Play Books and check that media controls
are available in QS.

Change-Id: Ifc404be2de6f5f87a1d43e3b51d3ca00c73c6e06
(cherry picked from commit 8cc72bdf3a)
Merged-In: Ifc404be2de6f5f87a1d43e3b51d3ca00c73c6e06
 2020-09-18 18:48:29 +00:00
Bill Yi
e935e010b3 Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" 2020-09-18 18:47:48 +00:00
TreeHugger Robot
fe614e0738 Merge "Filter out notif updates based on active media session" into rvc-qpr-dev 2020-09-18 18:07:17 +00:00
TreeHugger Robot
00523e6c27 Merge "ActivityManager: kill frozen processes receiving sync transactions" into rvc-qpr-dev am: acd04189d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12568351

Change-Id: I6fccb69bed5232d2f4f30b633bab9ba8a011e5fd
 2020-09-18 17:19:56 +00:00
Robert Snoeberger
74b884a9d2 Filter out notif updates based on active media session 
When an app is casting there can be two active media sessions, one local
and one remote. In this situation, there should only be a media object
for the remote session in QS. To achieve this, filter out updates for
the local session.

Bug: 158604810
Bug: 158813341
Bug: 158652134
Test: manual - cast from iHeartRadio. Toggle play/pause from media
object and check that device shown in output switcher isn't rapidly
changing.
Test: manual - cast from LivePhish. Check that only a single media
object appears in QS.

Change-Id: Ia7b8d2f3df3e68f63049e3443315fc26811efec4
(cherry picked from commit 0e098127db)
Merged-In: Ia7b8d2f3df3e68f63049e3443315fc26811efec4
 2020-09-18 17:01:06 +00:00
TreeHugger Robot
acd04189d9 Merge "ActivityManager: kill frozen processes receiving sync transactions" into rvc-qpr-dev 2020-09-18 16:27:16 +00:00
Patrick Baumann
f0969e1fb1 [automerger skipped] Merge "Build AppsFilter cache in background" into rvc-qpr-dev am: 4336e7ca72 -s ours 
am skip reason: Change-Id Iafa85e838d7f753eaf74037c85f86ee1feeb17aa with SHA-1 b0f1feb01f is in history

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

Change-Id: Ibc8e3bfc9539eeb624c8f0dd7c4c86e3f5d43b59
 2020-09-18 14:59:08 +00:00
Patrick Baumann
4336e7ca72 Merge "Build AppsFilter cache in background" into rvc-qpr-dev 2020-09-18 14:52:02 +00:00
TreeHugger Robot
f6098d82bb Merge "Reduce vertical margins in landscape add controls" into rvc-qpr-dev am: 354b3ec329 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12616881

Change-Id: I601f3a01a3e733ff8aab1e755be75e8cb64f51ce
 2020-09-18 14:40:52 +00:00
TreeHugger Robot
354b3ec329 Merge "Reduce vertical margins in landscape add controls" into rvc-qpr-dev 2020-09-18 14:35:13 +00:00
TreeHugger Robot
dfe356fc6f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 6daf3381da -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2e450ee06860163d26cd717fe9cd651a5fac7c96
 2020-09-18 14:19:24 +00:00
TreeHugger Robot
3abedb64ad [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 2e0b7acd7e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibf42c58f8a402450c58db8e159a89df6aaca2b21
 2020-09-18 14:19:05 +00:00
TreeHugger Robot
c27958d2dd Merge "Controls - Custom icon/color issues" into rvc-qpr-dev am: 6095954e6d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12538364

Change-Id: I5c53baac4419a8d38f00bf842d8ae8347ca19f03
 2020-09-18 14:18:46 +00:00
TreeHugger Robot
6daf3381da Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-09-18 14:16:43 +00:00
TreeHugger Robot
2e0b7acd7e Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-09-18 14:14:39 +00:00
TreeHugger Robot
6095954e6d Merge "Controls - Custom icon/color issues" into rvc-qpr-dev 2020-09-18 13:09:32 +00:00
Bill Yi
bbc9203f49 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5a3fbe81bc011e0f0a3ce68c417da47b00a9ed1c
 2020-09-18 11:06:51 +00:00
Bill Yi
a0e09b34fb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8aa4e04507cf86a0681e26431e144447ebd0313f
 2020-09-18 09:36:44 +00:00