git.osdn.net Git - android-x86/frameworks-base.git/log

OSDN Git Service

(root) / android-x86 / frameworks-base.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Christopher Tate [Wed, 26 Feb 2020 01:48:49 +0000 (17:48 -0800)]

Verify all possible hosts that match web nav

Even if an <intent-filter> matches non-web schemes in addition to http
or https, make sure to include its cited hosts in the autoVerify
evaluation.

Bug: 150038428
Test: atest OsHostTests#testIntentFilterHostValidation
Change-Id: If9ef0fc53d96e6581c56d86f89fe63bc9a5fb89a

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 22:11:59 +0000 (22:11 +0000)]

Merge "Merge "Fix 'history' text" into rvc-dev am: 21e618d9ba am: 5ce4c6485f am: f4629a882f" into rvc-qpr-dev-plus-aosp am: 09d5d36ee8

Change-Id: I269fef9ae181440e0a70aff73e922e73171631dc

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 22:10:48 +0000 (22:10 +0000)]

Merge "Fix 'history' text" into rvc-dev am: 21e618d9ba am: 0b052c09b8 am: e6332f9552 am: 0c30caffa7

Change-Id: I906c4c0065bf3b3fc2a2108934193f5f0c356255

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 22:09:11 +0000 (22:09 +0000)]

Merge "Fix 'history' text" into rvc-dev am: 21e618d9ba am: 5ce4c6485f am: 2563a440b3 am: ba7fa29fee

Change-Id: Ia3374409565c7d7acd6c943520937a1b26d37504

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 21:58:06 +0000 (21:58 +0000)]

Merge "Merge "Fix 'history' text" into rvc-dev am: 21e618d9ba am: 5ce4c6485f am: f4629a882f" into rvc-qpr-dev-plus-aosp

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 21:57:59 +0000 (21:57 +0000)]

Merge "Fix 'history' text" into rvc-dev am: 21e618d9ba am: 0b052c09b8 am: e6332f9552

Change-Id: I9945265e88b9219b8a19ceb3ca9ccb8689d0c9c2

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 21:57:53 +0000 (21:57 +0000)]

Merge "Fix 'history' text" into rvc-dev am: 21e618d9ba am: 5ce4c6485f am: f4629a882f

Change-Id: I3b5e3ac9df8e376073efd4782ec6b38af4e8879f

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 21:56:24 +0000 (21:56 +0000)]

Merge "Fix 'history' text" into rvc-dev am: 21e618d9ba am: 5ce4c6485f am: 2563a440b3

Change-Id: I8d7b91fb9762fec07bebfcb75396faa1032ccb69

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 21:46:58 +0000 (21:46 +0000)]

Merge "Fix 'history' text" into rvc-dev am: 21e618d9ba am: 0b052c09b8

Change-Id: I4dac587629c330144060dd8d1d367321fce03f22

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 21:43:46 +0000 (21:43 +0000)]

Merge "Fix 'history' text" into rvc-dev am: 21e618d9ba am: 5ce4c6485f

Change-Id: I871e157f313c12b6754dadabca1821ea1b44f629

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 21:43:26 +0000 (21:43 +0000)]

Merge "Fix 'history' text" into rvc-dev am: 21e618d9ba am: 5ce4c6485f

Change-Id: Ib6686af382c33d8cf2e6b51625f0bb7e4a883f2d

commit | commitdiff | tree

Nathan Harold [Thu, 27 Feb 2020 21:35:05 +0000 (21:35 +0000)]

Merge changes from topics "optimize-networkscan", "remove-networkclass"

* changes:
Remove NetworkClass from TelephonyManager
Add Network Preference Bitmaps

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 21:34:26 +0000 (21:34 +0000)]

Merge "Fix 'history' text" into rvc-dev am: 21e618d9ba

Change-Id: I3f0ded00406a392e43f6d05709aa1d3d7787ce83

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 21:29:17 +0000 (21:29 +0000)]

Merge "Fix 'history' text" into rvc-dev am: 21e618d9ba

Change-Id: Id4c3fae381c4cc7c6c0cf3b38eed5619a07876a3

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 21:09:56 +0000 (21:09 +0000)]

Merge "Implement backup and restoration of conversation infos." into rvc-dev am: 8839aaee6d am: 350f6f8f9b am: 9f062ed8f0 am: 0038ef28f5

Change-Id: Ib8a414c13a6b6923e9e91f47f6dd43286a307ac8

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 21:09:43 +0000 (21:09 +0000)]

[automerger skipped] Merge "Add atom for a janky event reported by SurfaceFlinger." into rvc-dev am: 28a0b857f4 am: d20919e7fd am: 63ef1e44d1 -s ours am: 148314bf52 -s ours
am skip reason: Change-Id I368855e4045c78a0cb65041cca762f4d334de916 with SHA-1 5ac32622bb is in history

Change-Id: Idd9481c67b04e6b5a49d4f2ea2f4c9db6d13a600

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 21:09:26 +0000 (21:09 +0000)]

Merge "Fix a typo in config_pipEnableResizeForMenu." into rvc-dev am: 5b55f124d8 am: 83148d50e0 am: d04bb0cf2c am: 97040b3c50

Change-Id: Ia4241b095e11485870243191552c25f94d38937f

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 21:09:14 +0000 (21:09 +0000)]

Merge "Implement backup and restoration of conversation infos." into rvc-dev am: 8839aaee6d am: 7baf438c1d am: e1b833fbc6 am: 388031a2e3

Change-Id: I7db7344127d3057f7f2558740b83cb2f0405262b

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 21:08:37 +0000 (21:08 +0000)]

Merge "Implement backup and restoration of conversation infos." into rvc-dev am: 8839aaee6d am: 350f6f8f9b am: 469b51013d am: 6936837d1e

Change-Id: I819b265174d19338c51595f90cc40164ac85da2b

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 21:08:14 +0000 (21:08 +0000)]

[automerger skipped] Merge "Merge "Add atom for a janky event reported by SurfaceFlinger." into rvc-dev am: 28a0b857f4" into rvc-dev-plus-aosp am: 4a92dbdd80 -s ours am: 2fe4cde358 -s ours am: f40e0b916f -s ours
am skip reason: Change-Id I368855e4045c78a0cb65041cca762f4d334de916 with SHA-1 5ac32622bb is in history

Change-Id: Ib974be59944852e5e6a646148be4717b15fa0ec0

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 21:07:38 +0000 (21:07 +0000)]

Merge "Add support for customized network list" am: dad5a5f5cf am: 576fa81a22 am: f7016709d2 am: 62d67830f1 am: 9b3871e0ee

Change-Id: Ie26d5a83bdd1c7af7eebbe16bbeb690da3b3499d

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 21:07:08 +0000 (21:07 +0000)]

Merge "Fix a typo in config_pipEnableResizeForMenu." into rvc-dev am: 5b55f124d8 am: 21cc62b0b3 am: 82a0dc1d1f am: 0bc9114956

Change-Id: Ifb713a187f920453f3522da45a4568716f77432c

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 21:06:44 +0000 (21:06 +0000)]

[automerger skipped] Merge "Add atom for a janky event reported by SurfaceFlinger." into rvc-dev am: 28a0b857f4 am: d20919e7fd am: d3657a9ccb am: 2a9b78a882 -s ours
am skip reason: Change-Id I368855e4045c78a0cb65041cca762f4d334de916 with SHA-1 d09573a110 is in history

Change-Id: Ica2f0a213de4b97a6f880bfac32c3d712c6e2745

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 21:06:00 +0000 (21:06 +0000)]

Merge "Fix a typo in config_pipEnableResizeForMenu." into rvc-dev am: 5b55f124d8 am: 83148d50e0 am: 13d5bee9d0 am: c5200185a7

Change-Id: I8f040f440027d6529021641d69e091ab2dbf225e

commit | commitdiff | tree

Julia Reynolds [Thu, 27 Feb 2020 21:00:44 +0000 (21:00 +0000)]

Merge "Fix 'history' text" into rvc-dev

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 21:00:42 +0000 (21:00 +0000)]

Merge "Implement backup and restoration of conversation infos." into rvc-dev am: 8839aaee6d am: 350f6f8f9b am: 9f062ed8f0

Change-Id: Ifd2b50796cc73a01e9b40517d77942acce6df5d6

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 21:00:26 +0000 (21:00 +0000)]

[automerger skipped] Merge "Add atom for a janky event reported by SurfaceFlinger." into rvc-dev am: 28a0b857f4 am: d20919e7fd am: 63ef1e44d1 -s ours
am skip reason: Change-Id I368855e4045c78a0cb65041cca762f4d334de916 with SHA-1 5ac32622bb is in history

Change-Id: I32c0ceb692b385212a691f3bec48fcb875bbf0bf

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 20:59:59 +0000 (20:59 +0000)]

Merge "Fix a typo in config_pipEnableResizeForMenu." into rvc-dev am: 5b55f124d8 am: 83148d50e0 am: d04bb0cf2c

Change-Id: I52fb44b21f36a0fe147c99aadd177f225d60ca9e

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 20:55:01 +0000 (20:55 +0000)]

Merge "Implement backup and restoration of conversation infos." into rvc-dev am: 8839aaee6d am: 7baf438c1d am: e1b833fbc6

Change-Id: Idea60acdbc2178625d9e3df7d9b5d469fa758f85

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 20:54:55 +0000 (20:54 +0000)]

Merge "Implement backup and restoration of conversation infos." into rvc-dev am: 8839aaee6d am: 350f6f8f9b am: 469b51013d

Change-Id: Ie0f1a8ce93eb3b38f5f53f95cc178408aa93e675

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 20:54:48 +0000 (20:54 +0000)]

[automerger skipped] Merge "Merge "Add atom for a janky event reported by SurfaceFlinger." into rvc-dev am: 28a0b857f4" into rvc-dev-plus-aosp am: 4a92dbdd80 -s ours am: 2fe4cde358 -s ours
am skip reason: Change-Id I368855e4045c78a0cb65041cca762f4d334de916 with SHA-1 5ac32622bb is in history

Change-Id: I5e85541a85167e440feedf97a6123d59f8a3ee86

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 20:54:25 +0000 (20:54 +0000)]

Merge "Add support for customized network list" am: dad5a5f5cf am: 576fa81a22 am: f7016709d2 am: 62d67830f1

Change-Id: I060f495b2bb7294748b61f0369721a66e341476f

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 20:54:17 +0000 (20:54 +0000)]

Merge "Fix a typo in config_pipEnableResizeForMenu." into rvc-dev am: 5b55f124d8 am: 21cc62b0b3 am: 82a0dc1d1f

Change-Id: Ic01ca2c9ac564ea9c223fd37e1080b1aa5746fde

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 20:54:02 +0000 (20:54 +0000)]

Merge "Add atom for a janky event reported by SurfaceFlinger." into rvc-dev am: 28a0b857f4 am: d20919e7fd am: d3657a9ccb

Change-Id: Ieaa29abb800e0664310d897ee24557ec3b42f840

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 20:53:15 +0000 (20:53 +0000)]

Merge "Fix a typo in config_pipEnableResizeForMenu." into rvc-dev am: 5b55f124d8 am: 83148d50e0 am: 13d5bee9d0

Change-Id: I24cac6cfc80d36b27afca6089a3758825c3a5267

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 20:42:30 +0000 (20:42 +0000)]

Merge "Implement backup and restoration of conversation infos." into rvc-dev am: 8839aaee6d am: 7baf438c1d

Change-Id: I8b78cfc512738715d945166938b5712b2e202ad2

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 20:42:28 +0000 (20:42 +0000)]

Merge "Implement backup and restoration of conversation infos." into rvc-dev am: 8839aaee6d am: 350f6f8f9b

Change-Id: Ib1c20a67cb2e35d7dc60ab7eb4ee6578ef45abea

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 20:42:03 +0000 (20:42 +0000)]

Merge "Implement backup and restoration of conversation infos." into rvc-dev am: 8839aaee6d am: 350f6f8f9b

Change-Id: Ia6841a2a264f975e479bc0127747d571f6957f14

commit | commitdiff | tree

Trung Lam [Thu, 27 Feb 2020 20:39:40 +0000 (12:39 -0800)]

Merge "Implement backup and restoration of conversation infos." into rvc-dev
am: 8839aaee6d

Change-Id: I9987221be8dc60bc1c31f0a88eb7e0140da38d1b

commit | commitdiff | tree

Trung Lam [Thu, 27 Feb 2020 20:39:37 +0000 (12:39 -0800)]

Merge "Implement backup and restoration of conversation infos." into rvc-dev
am: 8839aaee6d

Change-Id: I8f2becd53e740de6e669211ec8f9a8a77bfc1709

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 20:38:28 +0000 (20:38 +0000)]

[automerger skipped] Merge "Merge "Add atom for a janky event reported by SurfaceFlinger." into rvc-dev am: 28a0b857f4" into rvc-dev-plus-aosp am: 4a92dbdd80 -s ours
am skip reason: Change-Id I368855e4045c78a0cb65041cca762f4d334de916 with SHA-1 5ac32622bb is in history

Change-Id: Ie66ae341e434edb00f05433a29a0402e9941821d

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 20:38:01 +0000 (20:38 +0000)]

Merge "Add atom for a janky event reported by SurfaceFlinger." into rvc-dev am: 28a0b857f4 am: d20919e7fd

Change-Id: I90de6cc471f4708c525eb7c37180bbddd2d1c8f0

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 20:37:29 +0000 (20:37 +0000)]

Merge "Add support for customized network list" am: dad5a5f5cf am: 576fa81a22 am: f7016709d2

Change-Id: Ic42861b4dbded54ef8a697f2eab1110332bcc97d

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 20:37:19 +0000 (20:37 +0000)]

Merge "Fix a typo in config_pipEnableResizeForMenu." into rvc-dev am: 5b55f124d8 am: 83148d50e0

Change-Id: I55b51508faecbcb36e6840d221077220b1ed82ee

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 20:37:17 +0000 (20:37 +0000)]

Merge "Fix a typo in config_pipEnableResizeForMenu." into rvc-dev am: 5b55f124d8 am: 21cc62b0b3

Change-Id: I9e020dcfe43ba7868d6cbf2dca1c84c77f8dbcfd

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 20:37:07 +0000 (20:37 +0000)]

Merge "Add atom for a janky event reported by SurfaceFlinger." into rvc-dev am: 28a0b857f4 am: d20919e7fd

Change-Id: I59882e186daaed713d45926024e996bd63d6c4bc

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 20:36:29 +0000 (20:36 +0000)]

Merge "Fix a typo in config_pipEnableResizeForMenu." into rvc-dev am: 5b55f124d8 am: 83148d50e0

Change-Id: Ib3454831fe2e81988f8e8c93e078bdd02382f97b

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 20:30:44 +0000 (20:30 +0000)]

Merge "Update EmergencyNumber API docs to indicate they can throw." am: 76db055e20 am: 4ddb5b7e1c am: 5fe27428f0 am: 8f77dde4da am: fdf06f2494

Change-Id: I6f900a157c61bd4bf8bc167b1e136734dd4b45d4

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 20:30:17 +0000 (20:30 +0000)]

[automerger skipped] Merge "Change Context parameter to @NonNull." am: ba07b06d19 am: 105fb4d00a -s ours am: b897ec4d9f -s ours am: 59eab9b0c1 -s ours am: bbbadfe17c -s ours
am skip reason: Change-Id Ife6befc7be5cd488265135d6c77c0557c7545f38 with SHA-1 3d70a9a87a is in history

Change-Id: I9dc1cc87eff8a4583e1b26c8216c0f339815609b

commit | commitdiff | tree

Christian Wailes [Thu, 27 Feb 2020 20:28:25 +0000 (20:28 +0000)]

Merge "Adds Zygote policy flags to control how applications are launched"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 27 Feb 2020 20:24:01 +0000 (20:24 +0000)]

Merge "Merge "Add atom for a janky event reported by SurfaceFlinger." into rvc-dev am: 28a0b857f4" into rvc-dev-plus-aosp

commit | commitdiff | tree

Alec Mouri [Thu, 27 Feb 2020 20:23:16 +0000 (12:23 -0800)]

Merge "Add atom for a janky event reported by SurfaceFlinger." into rvc-dev
am: 28a0b857f4

Change-Id: I6ec4b9c5b58c4fc58bafbf53bdddcaa7afe67b0d

commit | commitdiff | tree

Alec Mouri [Thu, 27 Feb 2020 20:23:08 +0000 (12:23 -0800)]

Merge "Add atom for a janky event reported by SurfaceFlinger." into rvc-dev
am: 28a0b857f4

Change-Id: Iaa49b592ee54d9292eb597eabf50126179205455

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 20:22:03 +0000 (20:22 +0000)]

Merge "Add support for customized network list" am: dad5a5f5cf am: 576fa81a22

Change-Id: I4611eb5bca242e25a58153c075359cadfdcc1d27

commit | commitdiff | tree

Ben Lin [Thu, 27 Feb 2020 20:20:29 +0000 (12:20 -0800)]

Merge "Fix a typo in config_pipEnableResizeForMenu." into rvc-dev
am: 5b55f124d8

Change-Id: Ib40078008f35bd7082e5ae74bea83d1f0022b2ac

commit | commitdiff | tree

Ben Lin [Thu, 27 Feb 2020 20:20:17 +0000 (12:20 -0800)]

Merge "Fix a typo in config_pipEnableResizeForMenu." into rvc-dev
am: 5b55f124d8

Change-Id: I3de227a351c5837bff22f56ab9f13006fe5e2b01

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 20:13:55 +0000 (20:13 +0000)]

Merge "Update EmergencyNumber API docs to indicate they can throw." am: 76db055e20 am: 4ddb5b7e1c am: 5fe27428f0 am: 8f77dde4da

Change-Id: I09d25d5bc55176e6ff487b76c350db82a35051be

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 20:13:39 +0000 (20:13 +0000)]

[automerger skipped] Merge "Change Context parameter to @NonNull." am: ba07b06d19 am: 105fb4d00a -s ours am: b897ec4d9f -s ours am: 59eab9b0c1 -s ours
am skip reason: Change-Id Ife6befc7be5cd488265135d6c77c0557c7545f38 with SHA-1 3d70a9a87a is in history

Change-Id: I5140e3070c8034932ddf0d4348040faea716907a

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 20:11:04 +0000 (20:11 +0000)]

Merge "Add support for customized network list" am: dad5a5f5cf

Change-Id: Ibb8caabc7a1f94a46573dc4549dac8f68242f17c

commit | commitdiff | tree

Jack Yu [Thu, 27 Feb 2020 19:59:08 +0000 (19:59 +0000)]

Merge "Add support for customized network list"

commit | commitdiff | tree

Trung Lam [Thu, 27 Feb 2020 19:56:29 +0000 (19:56 +0000)]

Merge "Implement backup and restoration of conversation infos." into rvc-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 27 Feb 2020 19:52:59 +0000 (19:52 +0000)]

Merge "Print carrier config access rules properly"

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 19:52:43 +0000 (19:52 +0000)]

Merge "Update EmergencyNumber API docs to indicate they can throw." am: 76db055e20 am: 4ddb5b7e1c am: 5fe27428f0

Change-Id: I055beb340cd6ad785de0e739add1d9e57978794d

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 19:52:21 +0000 (19:52 +0000)]

[automerger skipped] Merge "Change Context parameter to @NonNull." am: ba07b06d19 am: 105fb4d00a -s ours am: b897ec4d9f -s ours
am skip reason: Change-Id Ife6befc7be5cd488265135d6c77c0557c7545f38 with SHA-1 3d70a9a87a is in history

Change-Id: Ibf2308134e1aaa184f0024b3d2117deca5ce90be

commit | commitdiff | tree

Alec Mouri [Thu, 27 Feb 2020 19:47:44 +0000 (19:47 +0000)]

Merge "Add atom for a janky event reported by SurfaceFlinger." into rvc-dev

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 19:34:58 +0000 (19:34 +0000)]

Merge "Update EmergencyNumber API docs to indicate they can throw." am: 76db055e20 am: 4ddb5b7e1c

Change-Id: Ic6bcd32ab93a97a8d075e720acb5fc17612a3984

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 19:34:27 +0000 (19:34 +0000)]

[automerger skipped] Merge "Change Context parameter to @NonNull." am: ba07b06d19 am: 105fb4d00a -s ours
am skip reason: Change-Id Ife6befc7be5cd488265135d6c77c0557c7545f38 with SHA-1 3d70a9a87a is in history

Change-Id: I40bb0b8473337482cc8628409f21f01ba56fddbd

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 19:26:53 +0000 (19:26 +0000)]

Merge "Update EmergencyNumber API docs to indicate they can throw." am: 76db055e20

Change-Id: I1e34df3e17c249e26ac7d3cd813430e39bafaae9

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 19:20:35 +0000 (19:20 +0000)]

Merge "Merge "Add Doc about app disable or netowrk reset will remove suggeestion" into rvc-dev am: a99073b296 am: 5753e70af8" into rvc-d1-dev-plus-aosp am: 3e54fba643 am: 622a702778

Change-Id: I076304975b8f44fa6fe97ef87f1bca9b63d18718

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 19:20:21 +0000 (19:20 +0000)]

Merge "Merge "Add Doc about app disable or netowrk reset will remove suggeestion" into rvc-dev am: a99073b296 am: 56df7d4899" into rvc-d1-dev-plus-aosp am: 3d14661b3b am: 30b17f0819

Change-Id: Iee3a81ad3097482c500eb3d3c1f6afbdd87041c0

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 19:19:53 +0000 (19:19 +0000)]

Merge "Merge changes from topic "actor-signature-policy-rvc-dev" into rvc-dev am: b0c5105b2d am: e6df1e9de3" into rvc-d1-dev-plus-aosp am: 697cdcd626 am: 01147cb753

Change-Id: I1506e924900a00b6af246e19e5f8e47310a9b257

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 19:19:37 +0000 (19:19 +0000)]

Merge "Merge changes from topic "actor-signature-policy-rvc-dev" into rvc-dev am: b0c5105b2d am: 832fe4a424" into rvc-d1-dev-plus-aosp am: e33d7a0fa9 am: d69d179f59

Change-Id: I95216f40645e74df5b315fac51edcac8a22c78a2

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 19:18:32 +0000 (19:18 +0000)]

Merge "Add Doc about app disable or netowrk reset will remove suggeestion" into rvc-dev am: a99073b296 am: 5753e70af8 am: d895a85649 am: e9efe43e52

Change-Id: If8689b44e7283df01ee817825af6b2196dda9440

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 19:17:45 +0000 (19:17 +0000)]

Merge "Merge changes from topic "actor-signature-policy-rvc-dev" into rvc-dev am: b0c5105b2d am: e6df1e9de3 am: 01fdeba08b" into rvc-qpr-dev-plus-aosp am: 9b362ff9b7

Change-Id: Ia5869204383ae3fb270723874c468fb7a6205d0b

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 19:17:24 +0000 (19:17 +0000)]

Merge "Merge "Initialize PackageManagerService ApplicationInfo instances to system user" into rvc-dev am: ab5563dd1c am: 78b9c0fd5a" into rvc-d1-dev-plus-aosp am: bce6c05e37 am: 11b38f2d66

Change-Id: I7d1facf9ba3668f43136bf3cb55c87e7312401a1

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 19:17:03 +0000 (19:17 +0000)]

Merge "Initialize PackageManagerService ApplicationInfo instances to system user" into rvc-dev am: ab5563dd1c am: 78b9c0fd5a am: df33803788 am: d4719437d0

Change-Id: I28c41049b1365337965c38e37d07f2a4371e5b1e

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 19:16:55 +0000 (19:16 +0000)]

Merge "Initialize PackageManagerService ApplicationInfo instances to system user" into rvc-dev am: ab5563dd1c am: d7b7b5defe am: b76c70a3a2 am: 61e7f12c85

Change-Id: Icdf33bd30f122f10caa0d34083661bfd41f7b28c

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 19:16:40 +0000 (19:16 +0000)]

Merge "Hide TelephonyRegistryManager." into rvc-dev am: cc7682bd15 am: ff4d31eabd am: b9d27bc4b3 am: 7afcbaa16a

Change-Id: Ice9a8db27cdbccd796f73a95a65da310eeed9be0

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 19:16:32 +0000 (19:16 +0000)]

Merge "Hide TelephonyRegistryManager." into rvc-dev am: cc7682bd15 am: 5363f5e711 am: 0f35d3b8cf am: 2211f9e42e

Change-Id: I9680a46cfac045c985a4db02795af9ef6dd39731

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 19:15:48 +0000 (19:15 +0000)]

Merge "Change Context parameter to @NonNull." am: ba07b06d19

Change-Id: I1245d557bc08aa9bcf9babfe226ad6f245f57a68

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 19:15:40 +0000 (19:15 +0000)]

Merge "Hide TelephonyRegistryManager." into rvc-dev am: cc7682bd15 am: 5363f5e711 am: 35e0d1892e am: c6167205e3

Change-Id: Ia7093396b057e4153f051f3e5fe0c60d2d9f2a54

commit | commitdiff | tree

Tyler Gunn [Thu, 27 Feb 2020 19:09:43 +0000 (19:09 +0000)]

Merge "Update EmergencyNumber API docs to indicate they can throw."

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 19:07:04 +0000 (19:07 +0000)]

Merge "Merge "Add Doc about app disable or netowrk reset will remove suggeestion" into rvc-dev am: a99073b296 am: 5753e70af8" into rvc-d1-dev-plus-aosp am: 3e54fba643

Change-Id: I5288a7722175d757b5719fe46a6e7e811fff1596

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 19:05:57 +0000 (19:05 +0000)]

Merge "Merge "Add Doc about app disable or netowrk reset will remove suggeestion" into rvc-dev am: a99073b296 am: 56df7d4899" into rvc-d1-dev-plus-aosp am: 3d14661b3b

Change-Id: Ib526b5bfa18f9ca31401468aac340b29d4f53185

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 19:04:26 +0000 (19:04 +0000)]

Merge "Merge changes from topic "actor-signature-policy-rvc-dev" into rvc-dev am: b0c5105b2d am: e6df1e9de3" into rvc-d1-dev-plus-aosp am: 697cdcd626

Change-Id: I82042309a9290eee8436ea564c91a15d3d275e92

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 19:03:13 +0000 (19:03 +0000)]

Merge "Merge changes from topic "actor-signature-policy-rvc-dev" into rvc-dev am: b0c5105b2d am: 832fe4a424" into rvc-d1-dev-plus-aosp am: e33d7a0fa9

Change-Id: I13c2f99b61f4b2a1bb004efb421ad005d341361e

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 19:03:04 +0000 (19:03 +0000)]

Merge "Add Doc about app disable or netowrk reset will remove suggeestion" into rvc-dev am: a99073b296 am: 5753e70af8 am: d895a85649

Change-Id: I19b0e9e25e4b810be3d8f7ce428460262dcb403e

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 19:02:56 +0000 (19:02 +0000)]

Merge "Merge changes from topic "actor-signature-policy-rvc-dev" into rvc-dev am: b0c5105b2d am: e6df1e9de3 am: 01fdeba08b" into rvc-qpr-dev-plus-aosp

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 19:02:52 +0000 (19:02 +0000)]

Merge changes from topic "actor-signature-policy-rvc-dev" into rvc-dev am: b0c5105b2d am: e6df1e9de3 am: 01fdeba08b

Change-Id: I7adb8632f75d3392f35f062c2a449edcd3f43562

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 19:02:49 +0000 (19:02 +0000)]

Merge "Merge "Initialize PackageManagerService ApplicationInfo instances to system user" into rvc-dev am: ab5563dd1c am: 78b9c0fd5a" into rvc-d1-dev-plus-aosp am: bce6c05e37

Change-Id: I270041d29ee6b5071633b1192e4d557f1194bb93

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 19:02:43 +0000 (19:02 +0000)]

Merge "Initialize PackageManagerService ApplicationInfo instances to system user" into rvc-dev am: ab5563dd1c am: 78b9c0fd5a am: df33803788

Change-Id: I1e53f096adac6cddf9addaf8f3505e31123ab572

commit | commitdiff | tree

Amit Mahajan [Thu, 27 Feb 2020 19:02:14 +0000 (19:02 +0000)]

Merge "Change Context parameter to @NonNull."

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 19:02:03 +0000 (19:02 +0000)]

Merge "Initialize PackageManagerService ApplicationInfo instances to system user" into rvc-dev am: ab5563dd1c am: d7b7b5defe am: b76c70a3a2

Change-Id: Ie7193e5c41e1227e5a95f322fb675240b4b328ed

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 19:01:39 +0000 (19:01 +0000)]

Merge "Hide TelephonyRegistryManager." into rvc-dev am: cc7682bd15 am: ff4d31eabd am: b9d27bc4b3

Change-Id: Ic48703e0ab93b47203348b633f8f402dc1cfd4ad

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 18:59:57 +0000 (18:59 +0000)]

Merge "Hide TelephonyRegistryManager." into rvc-dev am: cc7682bd15 am: 5363f5e711 am: 0f35d3b8cf

Change-Id: If342dfb01e8faac507e9fa1d71f2da55c3569881

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 18:59:26 +0000 (18:59 +0000)]

Merge "Hide TelephonyRegistryManager." into rvc-dev am: cc7682bd15 am: 5363f5e711 am: 35e0d1892e

Change-Id: I5ef010edc5d8b583ba639fc076aed4f52f99d9dd

commit | commitdiff | tree

Ben Lin [Thu, 27 Feb 2020 18:45:17 +0000 (18:45 +0000)]

Merge "Fix a typo in config_pipEnableResizeForMenu." into rvc-dev

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 18:44:35 +0000 (18:44 +0000)]

Merge changes I41959627,Iba316772 into rvc-dev am: 9a979fb217 am: 22dade988d am: a7d90b6381 am: 35de6c2122

Change-Id: I3e2212b979a651723b5dc2a002f68b0963733392

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 18:44:23 +0000 (18:44 +0000)]

Merge "Merge "Fix PowerIncidentTest" into rvc-dev am: 36eeacc058 am: 77292924e4" into rvc-d1-dev-plus-aosp am: b13141aaf0 am: 4b2a453ff6

Change-Id: I6e406e7e5b899bc55ed01314ce4fd10e229596ae

commit | commitdiff | tree

Automerger Merge Worker [Thu, 27 Feb 2020 18:44:12 +0000 (18:44 +0000)]

Merge changes I41959627,Iba316772 into rvc-dev am: 9a979fb217 am: d806110483 am: 71dfff2541 am: b189ab8e30

Change-Id: Ib959a45be90e39553cf465a5d9e99a88af08974e

frameworks/base

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.