Commit Graph

543810 Commits

Author SHA1 Message Date
TreeHugger Robot
effe9c69ff Merge "DO NOT MERGE: Call handleInitialize() in the end of constructor" into rvc-dev am: b41f1aef94 am: e39c2ae331 am: a9df198ec8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11960757

Change-Id: I71b4f4c5844c033bd89809512ab91a7f7874eca9
2020-06-24 16:45:29 +00:00
Yu-Han Yang
b0997acf25 DO NOT MERGE: Call handleInitialize() in the end of constructor am: aa4ec3c808 am: 2ded66dd29 am: ccd8a79ae6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11960757

Change-Id: I7de506a4f60d45618f30eb5c9c3bf963755b8974
2020-06-24 16:45:24 +00:00
TreeHugger Robot
ad47f90399 Merge "Add string for "See more apps"" into rvc-dev am: 11e7231a75 am: ebc86a0717 am: fe539c1f63
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11987678

Change-Id: If20570c39b657fc2113281b71f59871fe6cf2bbc
2020-06-24 16:44:51 +00:00
TreeHugger Robot
9c63acaba0 Merge "Add additional info to device ID docs in TelephonyManager and Build" into rvc-dev am: 3fa2d86fd0 am: 11d1ba3fde am: 3a58e273fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11980365

Change-Id: I718af895cdb035e3c84f609385b189554d2f6ae9
2020-06-24 16:44:37 +00:00
TreeHugger Robot
485aeb4c92 Merge "DO NOT MERGE: Call handleInitialize() in the end of constructor" into rvc-dev am: b41f1aef94 am: 6e1088e89a am: 5dc0158f3c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11960757

Change-Id: If3f5a88b9b398b433c281a8a24bedf0d36021f74
2020-06-24 16:44:26 +00:00
Yu-Han Yang
5552040126 DO NOT MERGE: Call handleInitialize() in the end of constructor am: aa4ec3c808 am: 0ea1a14e95 am: 47c4f73aed
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11960757

Change-Id: I714b6f669b1f9b1a6b43bd667d7ff2f683742b4e
2020-06-24 16:44:22 +00:00
TreeHugger Robot
b3e8ea4571 Merge "Add string for "See more apps"" into rvc-dev am: 11e7231a75 am: d1c483609c am: dd39cdd80f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11987678

Change-Id: I7d2b198dfa261f8d930d3aa1a700b9dd7024c6bf
2020-06-24 16:44:07 +00:00
TreeHugger Robot
5a0c835564 Merge "Add additional info to device ID docs in TelephonyManager and Build" into rvc-dev am: 3fa2d86fd0 am: e71ed27853 am: 4cad6acf29
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11980365

Change-Id: Icc6a16e55cd87d0f000a93c7e71b0c42fb82dba7
2020-06-24 16:43:50 +00:00
TreeHugger Robot
a9df198ec8 Merge "DO NOT MERGE: Call handleInitialize() in the end of constructor" into rvc-dev am: b41f1aef94 am: e39c2ae331
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11960757

Change-Id: Ife931c5d545e940143de27ca0413dd82d7a9d12b
2020-06-24 16:43:37 +00:00
Treehugger Robot
d9775a91a0 Merge "Identity: Update for changes to ISO 18013-5." am: 5594199543 am: 4e1c9599b2 am: afde0d645d am: ef8846f17c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1345496

Change-Id: Ib2f91b97ad53b7ca213ee12706a7673762f33377
2020-06-24 16:43:34 +00:00
Yu-Han Yang
ccd8a79ae6 DO NOT MERGE: Call handleInitialize() in the end of constructor am: aa4ec3c808 am: 2ded66dd29
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11960757

Change-Id: I1aeee809cf67038af8b0e4094e88fa80e72bc583
2020-06-24 16:43:33 +00:00
TreeHugger Robot
fe539c1f63 Merge "Add string for "See more apps"" into rvc-dev am: 11e7231a75 am: ebc86a0717
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11987678

Change-Id: Ib2efc9ece6e33ce7e80704d9d59e8f9f6af5bfd0
2020-06-24 16:43:19 +00:00
TreeHugger Robot
3a58e273fc Merge "Add additional info to device ID docs in TelephonyManager and Build" into rvc-dev am: 3fa2d86fd0 am: 11d1ba3fde
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11980365

Change-Id: I91e685b594bd82b8b34717eae9619f6894389dac
2020-06-24 16:42:57 +00:00
TreeHugger Robot
5dc0158f3c Merge "DO NOT MERGE: Call handleInitialize() in the end of constructor" into rvc-dev am: b41f1aef94 am: 6e1088e89a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11960757

Change-Id: Ia1714f7fa2c411439a124fc5f16a07a74310a743
2020-06-24 16:30:37 +00:00
Yu-Han Yang
47c4f73aed DO NOT MERGE: Call handleInitialize() in the end of constructor am: aa4ec3c808 am: 0ea1a14e95
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11960757

Change-Id: I4ff694024a3cbc2300b03f0c242e6d3685c0c0ab
2020-06-24 16:30:33 +00:00
TreeHugger Robot
dd39cdd80f Merge "Add string for "See more apps"" into rvc-dev am: 11e7231a75 am: d1c483609c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11987678

Change-Id: I72d53a5e8fc0efafc6d585f93be344ac0c43d008
2020-06-24 16:30:22 +00:00
TreeHugger Robot
e39c2ae331 Merge "DO NOT MERGE: Call handleInitialize() in the end of constructor" into rvc-dev am: b41f1aef94
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11960757

Change-Id: I16f9425abd93d294f2f3cecd1dd7a019bac5856a
2020-06-24 16:30:16 +00:00
TreeHugger Robot
6e1088e89a Merge "DO NOT MERGE: Call handleInitialize() in the end of constructor" into rvc-dev am: b41f1aef94
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11960757

Change-Id: Ied6461a681d63396fba206b5e37aa96ed4b20283
2020-06-24 16:30:16 +00:00
Yu-Han Yang
2ded66dd29 DO NOT MERGE: Call handleInitialize() in the end of constructor am: aa4ec3c808
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11960757

Change-Id: I8bd7246e31b02cf2d2ed84b221237c75bb1437dd
2020-06-24 16:30:13 +00:00
Yu-Han Yang
0ea1a14e95 DO NOT MERGE: Call handleInitialize() in the end of constructor am: aa4ec3c808
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11960757

Change-Id: I1a7880a6f92dd6ab98bdb877b29048495f6a6742
2020-06-24 16:30:12 +00:00
TreeHugger Robot
4cad6acf29 Merge "Add additional info to device ID docs in TelephonyManager and Build" into rvc-dev am: 3fa2d86fd0 am: e71ed27853
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11980365

Change-Id: I0359e8ea3036dc829c65fe8bf940224e0b6a0825
2020-06-24 16:30:11 +00:00
Treehugger Robot
ef8846f17c Merge "Identity: Update for changes to ISO 18013-5." am: 5594199543 am: 4e1c9599b2 am: afde0d645d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1345496

Change-Id: I285dd58bad4fc3e35fc48208aee8ac2a77c9e97a
2020-06-24 16:29:42 +00:00
TreeHugger Robot
ebc86a0717 Merge "Add string for "See more apps"" into rvc-dev am: 11e7231a75
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11987678

Change-Id: Ic5819068053e19fe0dc7e1b3dd66ade6f2e1d8af
2020-06-24 16:29:36 +00:00
TreeHugger Robot
d1c483609c Merge "Add string for "See more apps"" into rvc-dev am: 11e7231a75
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11987678

Change-Id: If3bffe9d106c25241fcb3a790b659f0f8622ce2b
2020-06-24 16:29:32 +00:00
TreeHugger Robot
e71ed27853 Merge "Add additional info to device ID docs in TelephonyManager and Build" into rvc-dev am: 3fa2d86fd0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11980365

Change-Id: I70c91479f8f8557f1e0abbd125c6a4e24c262bd8
2020-06-24 16:29:17 +00:00
TreeHugger Robot
11d1ba3fde Merge "Add additional info to device ID docs in TelephonyManager and Build" into rvc-dev am: 3fa2d86fd0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11980365

Change-Id: I464bd5f8ca393f9df0016de5a5cf176ecafeda28
2020-06-24 16:29:06 +00:00
Automerger Merge Worker
5637720e7c Merge "Merge "Fixed a invalid fd issue" into rvc-dev am: 6f8ee88a04 am: ddc29f777c am: 9ce920ae17" into rvc-qpr-dev-plus-aosp 2020-06-24 16:24:28 +00:00
Automerger Merge Worker
91b5effc5f Merge "Merge "Fixed a invalid fd issue" into rvc-dev am: 6f8ee88a04 am: ddc29f777c am: eb38e6fa10" into rvc-qpr-dev-plus-aosp 2020-06-24 16:24:24 +00:00
TreeHugger Robot
68b2b9810e Merge "Fixed a invalid fd issue" into rvc-dev am: 6f8ee88a04 am: ddc29f777c am: 9ce920ae17
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11978883

Change-Id: I02e824e39bf4b26f037d51e7bd9834640a6f5817
2020-06-24 16:24:22 +00:00
Automerger Merge Worker
a48e3dedda Merge "Merge "Merge "Fixed a invalid fd issue" into rvc-dev am: 6f8ee88a04 am: 8e295ad202" into rvc-d1-dev-plus-aosp am: d62b0a6301" into rvc-qpr-dev-plus-aosp 2020-06-24 16:24:17 +00:00
TreeHugger Robot
ae11424b6c Merge "Fixed a invalid fd issue" into rvc-dev am: 6f8ee88a04 am: ddc29f777c am: eb38e6fa10
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11978883

Change-Id: Iab543d4fd8566993b9b4b507532c26a87266ce90
2020-06-24 16:24:16 +00:00
Automerger Merge Worker
03d6e6b5de Merge "Merge "Fixed a invalid fd issue" into rvc-dev am: 6f8ee88a04 am: 8e295ad202" into rvc-d1-dev-plus-aosp am: d62b0a6301
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11978883

Change-Id: Iff8ea5f1844eb3a7ab7514a4e036afe58c49e578
2020-06-24 16:24:10 +00:00
Automerger Merge Worker
067addb230 Merge "[automerger skipped] Merge "Use generated Java bindings for CEC HAL" into rvc-dev am: 51c03c8a31 am: d34c52d2dd am: 0432c04bfe -s ours" into rvc-qpr-dev-plus-aosp 2020-06-24 16:24:09 +00:00
TreeHugger Robot
11314d885b [automerger skipped] Merge "Use generated Java bindings for CEC HAL" into rvc-dev am: 51c03c8a31 am: d34c52d2dd am: 0432c04bfe -s ours
am skip reason: Change-Id I43c72ab6cc203da1d935bd51fc0fd11b930255ce with SHA-1 f0b07483d9 is in history

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

Change-Id: Ib7ccbc77f21018c85fa0cc807a477e8d9972e6d6
2020-06-24 16:24:03 +00:00
TreeHugger Robot
cffb301f66 [automerger skipped] Merge "Use generated Java bindings for CEC HAL" into rvc-dev am: 51c03c8a31 am: d34c52d2dd -s ours am: 90624f6f1e -s ours
am skip reason: Change-Id I43c72ab6cc203da1d935bd51fc0fd11b930255ce with SHA-1 f0b07483d9 is in history

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

Change-Id: I7184b2885d2d179d9565aa7d46f32908aeffba95
2020-06-24 16:23:57 +00:00
TreeHugger Robot
7d896adc05 [automerger skipped] Merge "Use generated Java bindings for CEC HAL" into rvc-dev am: 51c03c8a31 -s ours am: 79db68d006 -s ours am: f770632a3f -s ours
am skip reason: Change-Id I43c72ab6cc203da1d935bd51fc0fd11b930255ce with SHA-1 2f0e16a8e6 is in history

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

Change-Id: I45d025d651a3d5ead6d54042f9bf010de69c57f3
2020-06-24 16:23:47 +00:00
Automerger Merge Worker
ce6e4d5b0b Merge "Merge "Merge "Only remove bubbles with null shortcutinfo if they have a shortcut ID." into rvc-dev am: 7ca0ea6869 am: db112f6bc8" into rvc-d1-dev-plus-aosp am: 5d11e44057" into rvc-qpr-dev-plus-aosp 2020-06-24 16:23:32 +00:00
TreeHugger Robot
b41f1aef94 Merge "DO NOT MERGE: Call handleInitialize() in the end of constructor" into rvc-dev 2020-06-24 16:23:27 +00:00
Automerger Merge Worker
46831d0248 Merge "Merge "Only remove bubbles with null shortcutinfo if they have a shortcut ID." into rvc-dev am: 7ca0ea6869 am: db112f6bc8" into rvc-d1-dev-plus-aosp am: 5d11e44057
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11977430

Change-Id: I059c6423161a83b71a102f408eb34b2824d20876
2020-06-24 16:23:26 +00:00
Automerger Merge Worker
8e0aeb54d9 Merge "Merge "Only remove bubbles with null shortcutinfo if they have a shortcut ID." into rvc-dev am: 7ca0ea6869 am: db112f6bc8 am: b8040271e7" into rvc-qpr-dev-plus-aosp 2020-06-24 16:23:21 +00:00
Josh Tsuji
c7d35ea32a Merge "Only remove bubbles with null shortcutinfo if they have a shortcut ID." into rvc-dev am: 7ca0ea6869 am: 7fda6416c5 am: 15c33a10f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11977430

Change-Id: I17f3e57b16d4e51b65a042565cf792c61ad76ec0
2020-06-24 16:23:06 +00:00
Josh Tsuji
6f847dd4bd Merge "Only remove bubbles with null shortcutinfo if they have a shortcut ID." into rvc-dev am: 7ca0ea6869 am: db112f6bc8 am: b8040271e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11977430

Change-Id: I05f707c942fbca49a121a16abb3a47c97a47140e
2020-06-24 16:23:06 +00:00
TreeHugger Robot
11e7231a75 Merge "Add string for "See more apps"" into rvc-dev 2020-06-24 16:21:57 +00:00
Treehugger Robot
afde0d645d Merge "Identity: Update for changes to ISO 18013-5." am: 5594199543 am: 4e1c9599b2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1345496

Change-Id: Icca0445a3d79a8541085310ff8638204d616ee00
2020-06-24 16:18:03 +00:00
TreeHugger Robot
3fa2d86fd0 Merge "Add additional info to device ID docs in TelephonyManager and Build" into rvc-dev 2020-06-24 16:15:32 +00:00
TreeHugger Robot
eb38e6fa10 Merge "Fixed a invalid fd issue" into rvc-dev am: 6f8ee88a04 am: ddc29f777c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11978883

Change-Id: Ife080e210b4657db222edcf066f272eabcadce59
2020-06-24 16:12:22 +00:00
TreeHugger Robot
0432c04bfe Merge "Use generated Java bindings for CEC HAL" into rvc-dev am: 51c03c8a31 am: d34c52d2dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11986778

Change-Id: I84ee423db726e89735dcdc5fcb47a64787e0a526
2020-06-24 16:12:09 +00:00
TreeHugger Robot
9ce920ae17 Merge "Fixed a invalid fd issue" into rvc-dev am: 6f8ee88a04 am: ddc29f777c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11978883

Change-Id: Iea1023f7b39103e4d8b43bd9f0d009b81467a4ad
2020-06-24 16:12:04 +00:00
Automerger Merge Worker
d62b0a6301 Merge "Merge "Fixed a invalid fd issue" into rvc-dev am: 6f8ee88a04 am: 8e295ad202" into rvc-d1-dev-plus-aosp 2020-06-24 16:12:03 +00:00
TreeHugger Robot
90624f6f1e [automerger skipped] Merge "Use generated Java bindings for CEC HAL" into rvc-dev am: 51c03c8a31 am: d34c52d2dd -s ours
am skip reason: Change-Id I43c72ab6cc203da1d935bd51fc0fd11b930255ce with SHA-1 2f0e16a8e6 is in history

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

Change-Id: Iad3ffe5ecef8dd8defc7399bd09d0e6b8733fde8
2020-06-24 16:11:57 +00:00