Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
469,671 Commits 3 Branches 0 Tags
41634541f19898ef9fb4096881e8a7392a7378ec
Commit Graph

469671 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
41634541f1 Merge "Update device type of MediaDevice" into rvc-dev am: 3ad2ce635c am: 91ad3fabc7 
Change-Id: Ibbccc865b7655ebe6d87338e8daca4fe6c91c4ca
 2020-02-27 04:54:03 +00:00
Automerger Merge Worker
0a210abe2f Merge "Hide CarrierMessagingServiceWrapper for now." into rvc-dev am: 8e5e4e03a9 am: a44be1c266 
Change-Id: I34e53f01e7f7c38e9bb14477ec24ebc986120d52
 2020-02-27 04:53:56 +00:00
Automerger Merge Worker
39b7eccc8f Allow settingIgnored for DBH request if inEmergency am: 97e162d605 am: 8a1c944d0d am: 808ba9a7cd 
Change-Id: Ife575824fafd2674b3c1114847d08cc42d0f848f
 2020-02-27 04:53:26 +00:00
Automerger Merge Worker
91ad3fabc7 Merge "Update device type of MediaDevice" into rvc-dev am: 3ad2ce635c 
Change-Id: Ic87e2dd4b5098c479c8f515f65fe992452cc6f5e
 2020-02-27 04:08:25 +00:00
Automerger Merge Worker
a44be1c266 Merge "Hide CarrierMessagingServiceWrapper for now." into rvc-dev am: 8e5e4e03a9 
Change-Id: Ida4001ec6f6ebb0f80447b12c28b98e0a590432f
 2020-02-27 04:08:14 +00:00
Automerger Merge Worker
808ba9a7cd Allow settingIgnored for DBH request if inEmergency am: 97e162d605 am: 8a1c944d0d 
Change-Id: Ieda5580cd90f629d5f866d2d162bb64c48449806
 2020-02-27 04:07:57 +00:00
TreeHugger Robot
3ad2ce635c Merge "Update device type of MediaDevice" into rvc-dev 2020-02-27 04:06:09 +00:00
TreeHugger Robot
8e5e4e03a9 Merge "Hide CarrierMessagingServiceWrapper for now." into rvc-dev 2020-02-27 04:04:35 +00:00
Automerger Merge Worker
ec3f866bb0 [automerger skipped] Merge "Add methods to send connected/disconnected state." am: bdb86ff8ab am: 33086f9d78 -s ours am: b483bccc69 -s ours 
am skip reason: Change-Id Ie90b8d290eab490061d5cb066744b67d597b9469 with SHA-1 339ba3ffac is in history

Change-Id: Id3a979b641253a0e1f657af931bf201ead3392ab
 2020-02-27 03:45:53 +00:00
Automerger Merge Worker
081979593c [automerger skipped] Merge "Use optional for nullable types" am: 12ac74a11f am: 3645c3f621 -s ours am: 4cdbae5d6c -s ours 
am skip reason: Change-Id I90cf2ce1193c479179687d71a5c1416f6cdf0b16 with SHA-1 605e39f5fd is in history

Change-Id: Iae92864125241ed6880ffd7e35a74872f567edf6
 2020-02-27 03:45:17 +00:00
Automerger Merge Worker
b483bccc69 [automerger skipped] Merge "Add methods to send connected/disconnected state." am: bdb86ff8ab am: 33086f9d78 -s ours 
am skip reason: Change-Id Ie90b8d290eab490061d5cb066744b67d597b9469 with SHA-1 339ba3ffac is in history

Change-Id: I17fbd370c969a11b9fd91de99ec6abc045db0e83
 2020-02-27 03:36:12 +00:00
Automerger Merge Worker
4cdbae5d6c [automerger skipped] Merge "Use optional for nullable types" am: 12ac74a11f am: 3645c3f621 -s ours 
am skip reason: Change-Id I90cf2ce1193c479179687d71a5c1416f6cdf0b16 with SHA-1 605e39f5fd is in history

Change-Id: I4de40290cccab9a55ec0f08c0ab1f020f4eca05e
 2020-02-27 03:35:31 +00:00
Automerger Merge Worker
db68198d8f Merge "stubs inheriting from framework-module-stubs-defaults-* now works" into rvc-dev am: 55daa202ba am: e9f3ada763 
Change-Id: If2d78f29ddbc7ff3e11e7379d34ac2244333221c
 2020-02-27 03:35:17 +00:00
Automerger Merge Worker
8a1c944d0d Allow settingIgnored for DBH request if inEmergency am: 97e162d605 
Change-Id: I12cbf0e098f599169392fb4ae7c725d5052b674e
 2020-02-27 03:35:09 +00:00
Automerger Merge Worker
e9f3ada763 Merge "stubs inheriting from framework-module-stubs-defaults-* now works" into rvc-dev am: 55daa202ba 
Change-Id: I2d713997ba5ebf87c74adb86e0248266bdaa897f
 2020-02-27 03:26:56 +00:00
Automerger Merge Worker
86e1b17ce3 Merge "stubs inheriting from framework-module-stubs-defaults-* now works" into rvc-dev am: 55daa202ba am: 91a68532d1 
Change-Id: I8f268d33f60d3e1b4521535e9823f434216955e1
 2020-02-27 03:26:56 +00:00
Automerger Merge Worker
e9987d7688 Merge "A few inline autofill API tweaks." into rvc-dev am: 658fc6d6d6 am: 355ca2bdbb 
Change-Id: Ic0ee94ce9da716b37548fab6c13fa66ceb3e48da
 2020-02-27 03:26:47 +00:00
Automerger Merge Worker
d1e01aa93e Merge "A few inline autofill API tweaks." into rvc-dev am: 658fc6d6d6 am: ec01225c09 
Change-Id: I677d5bf4a4a5185761106941acc82b792c3625cb
 2020-02-27 03:26:35 +00:00
Automerger Merge Worker
91a68532d1 Merge "stubs inheriting from framework-module-stubs-defaults-* now works" into rvc-dev am: 55daa202ba 
Change-Id: If9b21fca6e3c5e380157be4b6643022e792f7305
 2020-02-27 03:26:15 +00:00
Jiyong Park
55daa202ba Merge "stubs inheriting from framework-module-stubs-defaults-* now works" into rvc-dev 2020-02-27 03:23:52 +00:00
Automerger Merge Worker
33086f9d78 Merge "Add methods to send connected/disconnected state." am: bdb86ff8ab 
Change-Id: If69bd650e129dc9f058e47832d48651b9243a3bb
 2020-02-27 03:23:48 +00:00
Automerger Merge Worker
3645c3f621 Merge "Use optional for nullable types" am: 12ac74a11f 
Change-Id: If2e38b64c3bcbeac292c4bb1209bd643e7a2da86
 2020-02-27 03:22:55 +00:00
Automerger Merge Worker
355ca2bdbb Merge "A few inline autofill API tweaks." into rvc-dev am: 658fc6d6d6 
Change-Id: Ifa8aa617050dcb65d29011ba52345e8ea04c6e3f
 2020-02-27 03:21:36 +00:00
Automerger Merge Worker
ec01225c09 Merge "A few inline autofill API tweaks." into rvc-dev am: 658fc6d6d6 
Change-Id: I38bc6d0694372eabce98c2c288e9b68d1a66928c
 2020-02-27 03:21:21 +00:00
Aaron Huang
bdb86ff8ab Merge "Add methods to send connected/disconnected state." 2020-02-27 03:21:14 +00:00
Automerger Merge Worker
03b32de015 Merge "Fixed listeners were unexpectedly unregistered when device rotated" into rvc-dev am: 9a02e30990 am: 2f9f450d7b 
Change-Id: I8bd65eca410cb35f53d1e9b54f762a5f14cc6da7
 2020-02-27 03:18:28 +00:00
Automerger Merge Worker
d581d80ef7 Merge "Add --rename-resources-package to aapt2" into rvc-dev am: 57ee107188 am: 01b3a42acf 
Change-Id: I03bf0a680591dade9150e4a509fed4787f3c51d6
 2020-02-27 03:18:01 +00:00
Automerger Merge Worker
c4bd1388fe Merge "Merge "Add API constraints to ScheduledJobStateChanged atom" into rvc-dev am: 13ecf63ba4 am: f6ebbd2bd9" into rvc-d1-dev-plus-aosp 2020-02-27 03:17:43 +00:00
Automerger Merge Worker
25240f3f69 Merge "Fixed listeners were unexpectedly unregistered when device rotated" into rvc-dev am: 9a02e30990 am: 25ef7c55ba 
Change-Id: I5243bf277a6feda67825a1c4335fd3de5cc02562
 2020-02-27 03:17:37 +00:00
Automerger Merge Worker
bc80c080b0 Merge "Add API constraints to ScheduledJobStateChanged atom" into rvc-dev am: 13ecf63ba4 am: f6ebbd2bd9 
Change-Id: I120a253712cbdda75db5f55807545fd003b05582
 2020-02-27 03:17:37 +00:00
Automerger Merge Worker
a5ac8c2451 Merge "Add --rename-resources-package to aapt2" into rvc-dev am: 57ee107188 am: 9411c01c38 
Change-Id: I9ca4f629a285b5b2cef6b2de191e5823dca9937e
 2020-02-27 03:17:07 +00:00
Automerger Merge Worker
8900c9a867 Merge "Add API constraints to ScheduledJobStateChanged atom" into rvc-dev am: 13ecf63ba4 am: 2477a07249 
Change-Id: I60d35eafc5af57bc59182ed3b8db00780a1fd8c7
 2020-02-27 03:16:41 +00:00
TreeHugger Robot
658fc6d6d6 Merge "A few inline autofill API tweaks." into rvc-dev 2020-02-27 03:16:38 +00:00
Automerger Merge Worker
f6efd2a809 Merge "Merge "Let the autoVerify evaluator query all packages" into rvc-dev am: 3c32d2111f am: 22c394a67d" into rvc-d1-dev-plus-aosp 2020-02-27 03:16:35 +00:00
Automerger Merge Worker
c5343f7ec1 Merge "Let the autoVerify evaluator query all packages" into rvc-dev am: 3c32d2111f am: 22c394a67d 
Change-Id: I0a666c88bc6428ccdb9a33539b85b921bca6e177
 2020-02-27 03:16:30 +00:00
Automerger Merge Worker
df027c8d94 Merge "Let the autoVerify evaluator query all packages" into rvc-dev am: 3c32d2111f am: b00217743c 
Change-Id: Ic8b230cce5f923f7be37a10f590b008b85725406
 2020-02-27 03:16:28 +00:00
Automerger Merge Worker
2f9f450d7b Merge "Fixed listeners were unexpectedly unregistered when device rotated" into rvc-dev am: 9a02e30990 
Change-Id: I355da22f079a87bdb9792212a72c06094e35f2c1
 2020-02-27 03:16:20 +00:00
Automerger Merge Worker
9bd623124a Merge "Merge "Ensures display rotation triggers PiP re-position" into rvc-dev am: abe2fed8b0 am: 82962d0838" into rvc-d1-dev-plus-aosp 2020-02-27 03:16:18 +00:00
Automerger Merge Worker
dfaf7f910a Merge "Ensures display rotation triggers PiP re-position" into rvc-dev am: abe2fed8b0 am: 82962d0838 
Change-Id: I8ce982a736defc00a7294063771c0b931016887a
 2020-02-27 03:16:12 +00:00
Automerger Merge Worker
61946c243f Merge "Ensures display rotation triggers PiP re-position" into rvc-dev am: abe2fed8b0 am: 9341dd5dda 
Change-Id: I0108564a06344c0c9ca625672831515dd4d1c61f
 2020-02-27 03:16:08 +00:00
Automerger Merge Worker
25ef7c55ba Merge "Fixed listeners were unexpectedly unregistered when device rotated" into rvc-dev am: 9a02e30990 
Change-Id: I28af5ca4281f60785792bc7d573416ffc32036c2
 2020-02-27 03:15:39 +00:00
Shawn Lin
9a02e30990 Merge "Fixed listeners were unexpectedly unregistered when device rotated" into rvc-dev 2020-02-27 03:10:26 +00:00
Jooyung Han
12ac74a11f Merge "Use optional for nullable types" 2020-02-27 03:06:14 +00:00
Jooyung Han
f452968ae8 Use optional for nullable types 
AIDL generates optional<T> for nullable T types for C++, which is more
efficient and idomatic and easy to use.

Bug: 144773267
Test: build/flash/boot
Merged-In: I90cf2ce1193c479179687d71a5c1416f6cdf0b16
Change-Id: I90cf2ce1193c479179687d71a5c1416f6cdf0b16
(cherry picked from commit ff7f4279bd7fa33577f5f4d46aa9de322fb625d4)

Exempt-From-Owner-Approval: CP from master
 2020-02-27 03:05:19 +00:00
Automerger Merge Worker
9411c01c38 Merge "Add --rename-resources-package to aapt2" into rvc-dev am: 57ee107188 
Change-Id: I416f2cfeddf109c203c7e2c2e9fb827362e31555
 2020-02-27 03:02:22 +00:00
Automerger Merge Worker
01b3a42acf Merge "Add --rename-resources-package to aapt2" into rvc-dev am: 57ee107188 
Change-Id: Id96cce80688f09cb9c05a7f379af1970eb70b6e8
 2020-02-27 03:02:07 +00:00
Automerger Merge Worker
f6ebbd2bd9 Merge "Add API constraints to ScheduledJobStateChanged atom" into rvc-dev am: 13ecf63ba4 
Change-Id: I79662e2c07a3de06abc3b70ee4d5d800fe688fe4
 2020-02-27 03:01:46 +00:00
Automerger Merge Worker
2477a07249 Merge "Add API constraints to ScheduledJobStateChanged atom" into rvc-dev am: 13ecf63ba4 
Change-Id: Ie13dc4c1ec8b281328ba45df668349a8ae930c94
 2020-02-27 03:01:46 +00:00
TreeHugger Robot
57ee107188 Merge "Add --rename-resources-package to aapt2" into rvc-dev 2020-02-27 03:01:31 +00:00
Automerger Merge Worker
b00217743c Merge "Let the autoVerify evaluator query all packages" into rvc-dev am: 3c32d2111f 
Change-Id: I43b8b1667c7320e48655652cc3dd3c3449d75297
 2020-02-27 03:01:24 +00:00