Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
623,606 Commits 3 Branches 0 Tags
046870ae32ea7ed85cf55883052e93daef2dba3e
Commit Graph

623606 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
046870ae32 Merge changes from topic "ike-bcp-sc-dev" into sc-dev 
* changes:
  Ignore "android.net.ipsec.ike" <uses-library> tag
  Add IKE stub to main Android SDK
 2021-02-10 02:52:06 +00:00
TreeHugger Robot
85073a40c1 Merge "Adding toString in SmartspaceTargetEvent" into sc-dev 2021-02-10 02:43:55 +00:00
Brad Ebinger
b7322dae52 Merge "Add the ability to send the feature tags associated with IMS registration" into sc-dev 2021-02-10 02:01:51 +00:00
Josh Tsuji
56033d227d Merge "New Bubbles animations!" into sc-dev 2021-02-10 01:49:30 +00:00
TreeHugger Robot
f3421c57d4 Merge "VIMS: Helper method for InteractionService query." into sc-dev 2021-02-10 01:20:26 +00:00
TreeHugger Robot
faad7c721d Merge "Update docs for getServiceState" into sc-dev 2021-02-10 01:16:39 +00:00
TreeHugger Robot
a1baf11eb9 Merge changes Ifb61fe59,I3439a8f0,I5c19dc60 into sc-dev 
* changes:
  Add total DMA-BUF heap pool size information to dumpsys meminfo
  Add total size of DMA-BUFs exported to 'dumpsys meminfo'
  Rename getIonMappedSizeKb to getDmabufMappedSizeKb
 2021-02-10 00:53:11 +00:00
Chris Li
2827f50783 Merge "Enable non resizable app in multi window by default" into sc-dev 2021-02-10 00:51:02 +00:00
Jeff DeCew
4db015d00e Merge changes from topic "notif_call_style_sc" into sc-dev 
* changes:
  Stop using ?attr/notificationHeaderTextAppearance
  Remove unused 'app_ops' from layout
  Implement Notification.CallStyle
 2021-02-10 00:42:26 +00:00
Kohsuke Yatoh
f26c5a51b5 Merge "Add test for font crash protection." into sc-dev 2021-02-10 00:40:06 +00:00
TreeHugger Robot
a2409ede66 Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev am: 5382574928 am: 0847618070 am: 77d6da8435 am: 88ad6db9f3 am: 3516e98daa am: 43ad2093d4 am: a436a9c15e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180989

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d8bb4591447d55b0f4370c1e0f32d8928abd8eb
 2021-02-10 00:32:54 +00:00
Eugene Susla
1d5711a230 [automerger skipped] RESTRICT AUTOMERGE am: 6a5777dd50 -s ours am: 80d043197c -s ours am: 4a510d0fc5 am: 3f1fb6507a -s ours am: 6766245f10 am: e52ac322a3 am: ec730b6a20 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ccdc8071701af2589bc0e7416124444e202f74a
 2021-02-10 00:32:45 +00:00
TreeHugger Robot
4b846f289d Merge changes from topic "cdm_overlay-qt-dev" into qt-dev am: 6759663285 am: a964117367 am: 8eef0f9d26 am: 0bc002f78c am: 28d77c0876 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13181018

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icce9ef396cbf0885d333ef26f5e1f6f11bc42c83
 2021-02-10 00:32:12 +00:00
Eugene Susla
edd38277b4 [automerger skipped] RESTRICT AUTOMERGE am: 30e9d28c22 am: 4d587c5aa9 -s ours am: 3c24d07dfb am: 19456a4b0a am: 457a380796 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idec93b30f5c42beb356b9f247e7a8c52e62fbdd7
 2021-02-10 00:32:03 +00:00
Automerger Merge Worker
f61e559281 Merge "[automerger skipped] resolve merge conflicts of 540b50bbe7 to qt-qpr1-dev am: 8750762ce0 -s ours am: ebde0f1f40 -s ours am: 58c483b685 -s ours am: 22f0fc0ee3 -s ours" into sc-dev 2021-02-10 00:31:48 +00:00
Michael Groover
360b532760 [automerger skipped] resolve merge conflicts of 540b50bbe7 to qt-qpr1-dev am: 8750762ce0 -s ours am: ebde0f1f40 -s ours am: 58c483b685 -s ours am: 22f0fc0ee3 -s ours 
am skip reason: Change-Id I9b8786a321b1ba79d81b74c3041589f30df8e9c8 with SHA-1 5aba70130d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I73ad8c9bbe47042c0a0b81e666cd97ab347de2d3
 2021-02-10 00:31:37 +00:00
TreeHugger Robot
c8674782bb Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev am: 5382574928 am: 0847618070 am: 77d6da8435 am: 88ad6db9f3 am: 3516e98daa am: 194285334b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180989

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id22cce24b23a13da53d4ff1190c2a7f75a17b5e0
 2021-02-10 00:31:31 +00:00
Eugene Susla
763181c4fb [automerger skipped] RESTRICT AUTOMERGE am: 6a5777dd50 -s ours am: 80d043197c -s ours am: 4a510d0fc5 am: 3f1fb6507a -s ours am: 6766245f10 am: e0fe640712 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180989

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a0c048cbfd3c2cd91c59413d336d7a5d88a2522
 2021-02-10 00:31:18 +00:00
Automerger Merge Worker
bad33538be Merge "Merge "Fix PolicyListener testing surface." am: c5bc3bcd8f am: 3b1c79bdc9 am: fb11991c1e" into sc-dev 2021-02-10 00:30:57 +00:00
Cody Kesting
1d6229ef49 Merge "Fix PolicyListener testing surface." am: c5bc3bcd8f am: 3b1c79bdc9 am: fb11991c1e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579686

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ief6ec93c745795c2fa96c50560e916196f68d3d5
 2021-02-10 00:30:43 +00:00
TreeHugger Robot
a290be05c6 Merge changes from topic "cdm_overlay-qt-dev" into qt-dev am: 6759663285 am: a964117367 am: 8eef0f9d26 am: 3260a9368c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13181018

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie888a1643357cd9827f5f1ab6de895073bafd029
 2021-02-10 00:30:34 +00:00
Eugene Susla
51b5b09129 [automerger skipped] RESTRICT AUTOMERGE am: 30e9d28c22 am: 4d587c5aa9 -s ours am: 3c24d07dfb am: 9497dac7ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13181018

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie8216b599580486cccbad63563d6ff336fc88e15
 2021-02-10 00:30:22 +00:00
TreeHugger Robot
a436a9c15e Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev am: 5382574928 am: 0847618070 am: 77d6da8435 am: 88ad6db9f3 am: 3516e98daa am: 43ad2093d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180989

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I127abae40864d8c4dbc709b21a77e9fcb69e2663
 2021-02-10 00:29:36 +00:00
Michael Groover
5ef3aaeb19 [automerger skipped] resolve merge conflicts of 540b50bbe7 to qt-qpr1-dev am: 8750762ce0 -s ours am: ebde0f1f40 -s ours am: fd06cdb5af -s ours 
am skip reason: Change-Id I9b8786a321b1ba79d81b74c3041589f30df8e9c8 with SHA-1 a953322575 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I62a5d1f133ad7fe224d2a173935aa2ebc1180070
 2021-02-10 00:29:33 +00:00
Eugene Susla
ec730b6a20 [automerger skipped] RESTRICT AUTOMERGE am: 6a5777dd50 -s ours am: 80d043197c -s ours am: 4a510d0fc5 am: 3f1fb6507a -s ours am: 6766245f10 am: e52ac322a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180989

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4fa2fe5cc107f4853c10f7559e1b9d63b8a670fb
 2021-02-10 00:29:24 +00:00
TreeHugger Robot
28d77c0876 Merge changes from topic "cdm_overlay-qt-dev" into qt-dev am: 6759663285 am: a964117367 am: 8eef0f9d26 am: 0bc002f78c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13181018

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If89872e86cf38dc24d563e38d8ec638dad464efa
 2021-02-10 00:29:06 +00:00
Eugene Susla
457a380796 [automerger skipped] RESTRICT AUTOMERGE am: 30e9d28c22 am: 4d587c5aa9 -s ours am: 3c24d07dfb am: 19456a4b0a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13181018

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I37877b35cb9051ee6b0fbb434d05711da2a88048
 2021-02-10 00:28:50 +00:00
Michael Groover
22f0fc0ee3 [automerger skipped] resolve merge conflicts of 540b50bbe7 to qt-qpr1-dev am: 8750762ce0 -s ours am: ebde0f1f40 -s ours am: 58c483b685 -s ours 
am skip reason: Change-Id I9b8786a321b1ba79d81b74c3041589f30df8e9c8 with SHA-1 a953322575 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6c6ea8965bacf39b8d05fa285de487394a053980
 2021-02-10 00:28:29 +00:00
TreeHugger Robot
a72c786a0b Merge "Update LS/AOD clock" into sc-dev 2021-02-10 00:19:32 +00:00
TreeHugger Robot
194285334b Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev am: 5382574928 am: 0847618070 am: 77d6da8435 am: 88ad6db9f3 am: 3516e98daa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180989

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I71c2182d8224314d0acca2cc1146edb7f7f4b340
 2021-02-10 00:06:34 +00:00
Eugene Susla
e0fe640712 [automerger skipped] RESTRICT AUTOMERGE am: 6a5777dd50 -s ours am: 80d043197c -s ours am: 4a510d0fc5 am: 3f1fb6507a -s ours am: 6766245f10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180989

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I935cb7b8db8c8acc95fca3ea26b7e747887f1c38
 2021-02-10 00:06:32 +00:00
TreeHugger Robot
3260a9368c Merge changes from topic "cdm_overlay-qt-dev" into qt-dev am: 6759663285 am: a964117367 am: 8eef0f9d26 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13181018

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0deef54df08b068a7cce08931111bf7a3521561f
 2021-02-10 00:05:53 +00:00
Eugene Susla
9497dac7ea [automerger skipped] RESTRICT AUTOMERGE am: 30e9d28c22 am: 4d587c5aa9 -s ours am: 3c24d07dfb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13181018

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie2efca3a5747ef31742a85f70ff483087da6c9d3
 2021-02-10 00:05:51 +00:00
Michael Groover
fd06cdb5af [automerger skipped] resolve merge conflicts of 540b50bbe7 to qt-qpr1-dev am: 8750762ce0 -s ours am: ebde0f1f40 -s ours 
am skip reason: Change-Id I9b8786a321b1ba79d81b74c3041589f30df8e9c8 with SHA-1 a953322575 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifbea49432d86f2b9597532b6bf4a8fe1dd2aedc2
 2021-02-10 00:05:31 +00:00
TreeHugger Robot
43ad2093d4 Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev am: 5382574928 am: 0847618070 am: 77d6da8435 am: 88ad6db9f3 am: 3516e98daa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180989

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9fc3424fffffc3751faf53f8ca87d2c94864ce23
 2021-02-10 00:04:17 +00:00
Eugene Susla
e52ac322a3 [automerger skipped] RESTRICT AUTOMERGE am: 6a5777dd50 -s ours am: 80d043197c -s ours am: 4a510d0fc5 am: 3f1fb6507a -s ours am: 6766245f10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180989

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idb89ffd735b559380e1ce321b0a8d1170ab44f2e
 2021-02-10 00:04:09 +00:00
TreeHugger Robot
0bc002f78c Merge changes from topic "cdm_overlay-qt-dev" into qt-dev am: 6759663285 am: a964117367 am: 8eef0f9d26 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13181018

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c4cc928f634c0dfdc3ec3d036c8c5dfc0bb7167
 2021-02-10 00:03:39 +00:00
Eugene Susla
19456a4b0a [automerger skipped] RESTRICT AUTOMERGE am: 30e9d28c22 am: 4d587c5aa9 -s ours am: 3c24d07dfb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13181018

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifda810cfa71d212d92dd63ab052136e8fe5e723a
 2021-02-10 00:03:36 +00:00
Cody Kesting
fb11991c1e Merge "Fix PolicyListener testing surface." am: c5bc3bcd8f am: 3b1c79bdc9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579686

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I60347b063c5102b0abf9e1464c0f9b7438bcf347
 2021-02-10 00:03:35 +00:00
Michael Groover
58c483b685 [automerger skipped] resolve merge conflicts of 540b50bbe7 to qt-qpr1-dev am: 8750762ce0 -s ours am: ebde0f1f40 -s ours 
am skip reason: Change-Id I9b8786a321b1ba79d81b74c3041589f30df8e9c8 with SHA-1 a953322575 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7ba88ee303eb38e19d124331abfda6e09a14afdf
 2021-02-10 00:03:20 +00:00
TreeHugger Robot
ca17fb0be4 Merge "Convert UserPowerCalculator to work with BatteryUsageStats" into sc-dev 2021-02-09 23:54:12 +00:00
TreeHugger Robot
06406ff6be Merge "BatteryStats: Increase max size of subsystem state string" into sc-dev 2021-02-09 23:46:53 +00:00
TreeHugger Robot
0cbf7a2dfb Merge "BatteryStatsService: Check for power stats initialization" into sc-dev 2021-02-09 23:43:01 +00:00
TreeHugger Robot
3516e98daa Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev am: 5382574928 am: 0847618070 am: 77d6da8435 am: 88ad6db9f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180989

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97e2cfb8ccae18862b73fc4360016abfe1aa6613
 2021-02-09 23:41:02 +00:00
Eugene Susla
6766245f10 [automerger skipped] RESTRICT AUTOMERGE am: 6a5777dd50 -s ours am: 80d043197c -s ours am: 4a510d0fc5 am: 3f1fb6507a -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I689d2e339d23f8dd2b08f360d27d8520be5c41c2
 2021-02-09 23:40:58 +00:00
Cody Kesting
3b1c79bdc9 Merge "Fix PolicyListener testing surface." am: c5bc3bcd8f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579686

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0cf14631522a25f64939f67bcd5b65300f657213
 2021-02-09 23:40:45 +00:00
TreeHugger Robot
8eef0f9d26 Merge changes from topic "cdm_overlay-qt-dev" into qt-dev am: 6759663285 am: a964117367 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13181018

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I22ef7c07d5e7a7284810aff3f5308fcacb1f6b2c
 2021-02-09 23:40:38 +00:00
Eugene Susla
3c24d07dfb [automerger skipped] RESTRICT AUTOMERGE am: 30e9d28c22 am: 4d587c5aa9 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8bc4d6f366fab119da399da1a1a37024c4717dde
 2021-02-09 23:40:28 +00:00
Michael Groover
ebde0f1f40 [automerger skipped] resolve merge conflicts of 540b50bbe7 to qt-qpr1-dev am: 8750762ce0 -s ours 
am skip reason: Change-Id I9b8786a321b1ba79d81b74c3041589f30df8e9c8 with SHA-1 a953322575 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id982e8e6f2931509943c5d8e0f77202d04183c9e
 2021-02-09 23:40:02 +00:00
Shashwat Razdan
3ef21c78f5 Adding toString in SmartspaceTargetEvent 
Bug: 176851064
Test: Manual
Change-Id: I14e554817642447da315c8aeccfed83256155e58
 2021-02-09 15:32:52 -08:00