OSDN Git Service
Jorim Jaggi [Tue, 12 Jun 2018 12:23:55 +0000 (12:23 +0000)]
Merge "Enable expanding of status bar just below the notch"
Neil Fuller [Tue, 12 Jun 2018 09:49:33 +0000 (09:49 +0000)]
Merge "Simple pass-through TimeDetectorService"
Robin Lee [Tue, 12 Jun 2018 09:06:12 +0000 (09:06 +0000)]
Merge "Do not treat EXTRA_SMALL_ICON <int> as Parcelable"
Winson Chung [Tue, 12 Jun 2018 08:34:33 +0000 (01:34 -0700)]
Merge "Revert "Defer stop for all activities becoming invisible"" into pi-dev am:
b2dac061bb
am:
ce2b842a02
Change-Id: I3af2aca768ffbe310b16fdbc379c77b1490710f1
Jean-Michel Trivi [Tue, 12 Jun 2018 08:23:08 +0000 (01:23 -0700)]
Merge "AudioService: fix deallock setBluetoothScoOn vs setMode" into pi-dev am:
8a12361b8c
am:
257b52411c
Change-Id: I6ddfa299959df7c1e61137853c1c7c40ce3701d1
Winson Chung [Tue, 12 Jun 2018 07:34:56 +0000 (00:34 -0700)]
Merge "Revert "Defer stop for all activities becoming invisible"" into pi-dev
am:
b2dac061bb
Change-Id: Ia09141c88e964ccfafe75fa6a0d0c7e19ddeadd4
Android Build Merger (Role) [Tue, 12 Jun 2018 07:13:11 +0000 (07:13 +0000)]
[automerger] Merge "Revert "Defer stop for all activities becoming invisible"" into pi-dev am:
b2dac061bb am:
5d0c692fc8
Change-Id: I1498fe2942980126a28794c82035b54f234365a2
Winson Chung [Tue, 12 Jun 2018 07:12:28 +0000 (00:12 -0700)]
Merge "Revert "Defer stop for all activities becoming invisible"" into pi-dev
am:
b2dac061bb
Change-Id: Iacab2fc896a9fb7a8313926b0f6dfc5355d468a2
Winson Chung [Tue, 12 Jun 2018 06:45:15 +0000 (06:45 +0000)]
Merge "Revert "Defer stop for all activities becoming invisible"" into pi-dev
TreeHugger Robot [Tue, 12 Jun 2018 06:12:22 +0000 (06:12 +0000)]
Merge "Only keep methods with correct signature for view/menu click"
Android Build Merger (Role) [Tue, 12 Jun 2018 05:42:32 +0000 (05:42 +0000)]
[automerger] Merge "AudioService: fix deallock setBluetoothScoOn vs setMode" into pi-dev am:
8a12361b8c am:
f3e07916bb
Change-Id: I31d12210e143026eb1467f16920581a199d0fd1f
Jean-Michel Trivi [Tue, 12 Jun 2018 05:41:51 +0000 (22:41 -0700)]
Merge "AudioService: fix deallock setBluetoothScoOn vs setMode" into pi-dev
am:
8a12361b8c
Change-Id: Iba3c61d775b47919a63a47982c0197d125dddf54
Jean-Michel Trivi [Tue, 12 Jun 2018 05:18:53 +0000 (22:18 -0700)]
Merge "AudioService: fix deallock setBluetoothScoOn vs setMode" into pi-dev
am:
8a12361b8c
Change-Id: Ia47fe3acf3d637d42d0ce3efaa6be1e0718e2acd
TreeHugger Robot [Tue, 12 Jun 2018 03:59:07 +0000 (03:59 +0000)]
Merge "AudioService: fix deallock setBluetoothScoOn vs setMode" into pi-dev
Bill Yi [Tue, 12 Jun 2018 03:58:25 +0000 (20:58 -0700)]
Merge changes from topic "am-
8bf63f1b-ab99-4537-ad90-
d648a4dd77b0" into oc-dev am:
c70d882667 am:
c262f7a96a am:
ac40bb76a1 am:
f8fe538f07
am:
e10d2c53fa
Change-Id: I9b901e3af99b51a0eba938674f65084b67f8db08
Bill Yi [Tue, 12 Jun 2018 03:47:58 +0000 (20:47 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9f043e5e58 skipped:
cc2c91ba39 am:
b1615a6d90 -s ours am:
2c56e9b54b -s ours am:
c37cca5739 -s ours am:
9b70877ea8 -s ours
am:
7eed4a4f60 -s ours
Change-Id: I7ca7d36efef3c69bf0830e0b46d2d87e6aa084ca
Bill Yi [Tue, 12 Jun 2018 03:40:40 +0000 (20:40 -0700)]
Merge changes from topic "am-
8eb97afa-063a-44e2-8d8e-
6d5670eb50b6" into oc-dev am:
836d1db239 am:
f527941ec8 am:
f4a3d1faf2 am:
88db3b5aae
am:
e7e9e5330e
Change-Id: Ia88337362d28b2fc73b7734d6d52d8d273eb3146
Bill Yi [Tue, 12 Jun 2018 03:29:45 +0000 (20:29 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5e25fd88a8 skipped:
c6a1d32ebe am:
6d30123999 -s ours am:
f9efc3043a -s ours am:
9e7657c13d -s ours am:
7609e23612 -s ours
am:
8dbbb70c59 -s ours
Change-Id: Ia45f2134aa4e2af731fe565888609e0dfd8dad09
TreeHugger Robot [Tue, 12 Jun 2018 02:43:20 +0000 (02:43 +0000)]
Merge "Log when a autofill is disabled in a view because of a parent's importance."
Bill Yi [Tue, 12 Jun 2018 02:36:52 +0000 (19:36 -0700)]
Merge changes from topic "am-
63639373-f180-4cce-87e9-
95ef192ab9ec" into oc-dev am:
3bbe3c7c93 am:
24701167ba am:
689cf0f8a2 am:
995c542d0c
am:
62fcf822c0
Change-Id: I548b57207b0794152d6ccd9a1c9e9d6ce415627d
Bill Yi [Tue, 12 Jun 2018 02:25:50 +0000 (19:25 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
0be149db42 skipped:
3c2edd55ce am:
71f5cfa650 -s ours am:
f2ce740a1e -s ours am:
b10ebef583 -s ours am:
7cea26fc9e -s ours
am:
043a6afff6 -s ours
Change-Id: I47ca39857a06da963a032f03b0144c910872119d
Bill Yi [Tue, 12 Jun 2018 02:18:23 +0000 (19:18 -0700)]
Merge changes from topic "am-
da3e9584-98c5-4975-8207-
a77d2301579a" into oc-dev am:
bd9caf4c6f am:
2b605d89b9 am:
64c1873c30 am:
6dbef2a740
am:
10b5ae6440
Change-Id: I587dd6c49c89a3309ff0edd0db7752bdd3a91fc9
Bill Yi [Tue, 12 Jun 2018 02:09:11 +0000 (19:09 -0700)]
Merge changes from topic "am-
8bf63f1b-ab99-4537-ad90-
d648a4dd77b0" into oc-dev am:
c70d882667 am:
c262f7a96a am:
ac40bb76a1
am:
f8fe538f07
Change-Id: I5b5360c99aeb67e14900d178f11faf435b7c42a3
Bill Yi [Tue, 12 Jun 2018 02:07:25 +0000 (19:07 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
05238c7743 skipped:
5e66cc00a4 am:
dafe5854dd -s ours am:
0c61c9baf6 -s ours am:
7567755399 -s ours am:
287d484b23 -s ours
am:
1ec3fa657f -s ours
Change-Id: I6854c3abef4e5ea6b69b3e691dc72975f93b02a6
Brad Ebinger [Tue, 12 Jun 2018 02:04:52 +0000 (19:04 -0700)]
[automerger skipped] Merge "Update Docs to clarify using a Message across IPC" am:
0be0692691 -s ours am:
b57dfe26cf -s ours
am:
6145aa4aa1 -s ours
Change-Id: Ifa7b500931ebe6f3387f18b62ce043ed52a1dadb
Bill Yi [Tue, 12 Jun 2018 01:59:28 +0000 (18:59 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9f043e5e58 skipped:
cc2c91ba39 am:
b1615a6d90 -s ours am:
2c56e9b54b -s ours am:
c37cca5739 -s ours
am:
9b70877ea8 -s ours
Change-Id: Iac4584e21e939ea6f770a64d7e5c16a561741bf8
Nan Zhang [Tue, 12 Jun 2018 01:57:41 +0000 (18:57 -0700)]
Merge "Remove test-* sources for Metalava api-stubs." into pi-dev-plus-aosp
am:
b7a46a7ec5
Change-Id: I58b0993effac259938c4f067188bb44ff1fa72cd
Bill Yi [Tue, 12 Jun 2018 01:52:55 +0000 (18:52 -0700)]
Merge changes from topic "am-
8eb97afa-063a-44e2-8d8e-
6d5670eb50b6" into oc-dev am:
836d1db239 am:
f527941ec8 am:
f4a3d1faf2
am:
88db3b5aae
Change-Id: Ia79761d8fb5b1bbdad7a0230dd5d1daef998ead2
Bill Yi [Tue, 12 Jun 2018 01:43:20 +0000 (18:43 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5e25fd88a8 skipped:
c6a1d32ebe am:
6d30123999 -s ours am:
f9efc3043a -s ours am:
9e7657c13d -s ours
am:
7609e23612 -s ours
Change-Id: I556cc2268f3feb0344b21be2f4a57cd15627047d
Bill Yi [Tue, 12 Jun 2018 01:36:57 +0000 (18:36 -0700)]
Merge changes from topic "am-
63639373-f180-4cce-87e9-
95ef192ab9ec" into oc-dev am:
3bbe3c7c93 am:
24701167ba am:
689cf0f8a2
am:
995c542d0c
Change-Id: I267178d0ab2cf05abdc5d685e139f05cbcc427ca
TreeHugger Robot [Tue, 12 Jun 2018 01:30:18 +0000 (01:30 +0000)]
Merge "Improve tests for ProGuard rules, add transition tests"
Bill Yi [Tue, 12 Jun 2018 01:27:17 +0000 (18:27 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
0be149db42 skipped:
3c2edd55ce am:
71f5cfa650 -s ours am:
f2ce740a1e -s ours am:
b10ebef583 -s ours
am:
7cea26fc9e -s ours
Change-Id: I3856a4767bab27699a68b765287e26b689a3906d
Bill Yi [Tue, 12 Jun 2018 01:21:05 +0000 (18:21 -0700)]
Merge changes from topic "am-
da3e9584-98c5-4975-8207-
a77d2301579a" into oc-dev am:
bd9caf4c6f am:
2b605d89b9 am:
64c1873c30
am:
6dbef2a740
Change-Id: Ibb8f520e2070a880028866931319ccbb60e373af
Bill Yi [Tue, 12 Jun 2018 01:11:30 +0000 (18:11 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
05238c7743 skipped:
5e66cc00a4 am:
dafe5854dd -s ours am:
0c61c9baf6 -s ours am:
7567755399 -s ours
am:
287d484b23 -s ours
Change-Id: Ia37e5c85013732a3a0e99a6829a58f792b123499
Android Build Merger (Role) [Tue, 12 Jun 2018 01:07:23 +0000 (01:07 +0000)]
[automerger] Merge changes from topic "am-
8bf63f1b-ab99-4537-ad90-
d648a4dd77b0" into oc-dev am:
c70d882667 am:
c262f7a96a am:
ac40bb76a1 am:
f8fe538f07 am:
77be097048
Change-Id: I38c7fec3815b2e03524f7d316d320dfa7d074c90
Android Build Merger (Role) [Tue, 12 Jun 2018 01:07:01 +0000 (01:07 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9f043e5e58 skipped:
cc2c91ba39 am:
b1615a6d90 -s ours am:
2c56e9b54b -s ours am:
c37cca5739 -s ours am:
9b70877ea8 -s ours skipped:
d5d396a791
Change-Id: Ie13e4bdf39fced5644122aca932fc584890af4a9
Bill Yi [Tue, 12 Jun 2018 01:06:23 +0000 (18:06 -0700)]
Merge changes from topic "am-
8bf63f1b-ab99-4537-ad90-
d648a4dd77b0" into oc-dev am:
c70d882667 am:
c262f7a96a am:
ac40bb76a1
am:
f8fe538f07
Change-Id: Ifdbce0f693c4c2fd011fdbb08b974c14da893d3b
Bill Yi [Tue, 12 Jun 2018 00:57:02 +0000 (17:57 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9f043e5e58 skipped:
cc2c91ba39 am:
b1615a6d90 -s ours am:
2c56e9b54b -s ours am:
c37cca5739 -s ours
am:
9b70877ea8 -s ours
Change-Id: Ie14b8e87c42b4552fb743d9af07310d203570b97
Android Build Merger (Role) [Tue, 12 Jun 2018 00:50:32 +0000 (00:50 +0000)]
[automerger] Merge changes from topic "am-
8eb97afa-063a-44e2-8d8e-
6d5670eb50b6" into oc-dev am:
836d1db239 am:
f527941ec8 am:
f4a3d1faf2 am:
88db3b5aae am:
a45e67eda2
Change-Id: I35e7c6abf891489c297a709a9ed487bc6b9b5597
Android Build Merger (Role) [Tue, 12 Jun 2018 00:50:01 +0000 (00:50 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5e25fd88a8 skipped:
c6a1d32ebe am:
6d30123999 -s ours am:
f9efc3043a -s ours am:
9e7657c13d -s ours am:
7609e23612 -s ours skipped:
0fb95aab2f
Change-Id: I56ce0a61a9ceba3df6e9661a14e37e014ccd54e1
Bill Yi [Tue, 12 Jun 2018 00:49:05 +0000 (17:49 -0700)]
Merge changes from topic "am-
8eb97afa-063a-44e2-8d8e-
6d5670eb50b6" into oc-dev am:
836d1db239 am:
f527941ec8 am:
f4a3d1faf2
am:
88db3b5aae
Change-Id: I73a28231684759b29e4d223ae03f9be8cb8f659b
Felipe Leme [Sat, 9 Jun 2018 00:54:40 +0000 (17:54 -0700)]
Log when a autofill is disabled in a view because of a parent's importance.
Such log helps diagnosing when app developers explicitly disabled autofill.
Bug:
79607009
Test: manual verification
Change-Id: I551f1cb2bd61068317677ced9bd32a6057f7dc62
Bill Yi [Tue, 12 Jun 2018 00:39:28 +0000 (17:39 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5e25fd88a8 skipped:
c6a1d32ebe am:
6d30123999 -s ours am:
f9efc3043a -s ours am:
9e7657c13d -s ours
am:
7609e23612 -s ours
Change-Id: I595c862f3752852f76fdafc8651ba740ef01b6e9
Android Build Merger (Role) [Tue, 12 Jun 2018 00:33:15 +0000 (00:33 +0000)]
[automerger] Merge changes from topic "am-
63639373-f180-4cce-87e9-
95ef192ab9ec" into oc-dev am:
3bbe3c7c93 am:
24701167ba am:
689cf0f8a2 am:
995c542d0c am:
21785f37d6
Change-Id: I647f2449d3d0917f1057e574973fa21df337e897
Android Build Merger (Role) [Tue, 12 Jun 2018 00:32:50 +0000 (00:32 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
0be149db42 skipped:
3c2edd55ce am:
71f5cfa650 -s ours am:
f2ce740a1e -s ours am:
b10ebef583 -s ours am:
7cea26fc9e -s ours skipped:
5d09c87525
Change-Id: I092409f7a1f48d7f3e907343e0602a80ce086b0a
Brad Ebinger [Tue, 12 Jun 2018 00:32:30 +0000 (17:32 -0700)]
[automerger skipped] Merge "Update Docs to clarify using a Message across IPC" am:
0be0692691 -s ours
am:
b57dfe26cf -s ours
Change-Id: Ie3294bee1121280f07d34b4ecae451779646678f
Bill Yi [Tue, 12 Jun 2018 00:32:10 +0000 (17:32 -0700)]
Merge changes from topic "am-
63639373-f180-4cce-87e9-
95ef192ab9ec" into oc-dev am:
3bbe3c7c93 am:
24701167ba am:
689cf0f8a2
am:
995c542d0c
Change-Id: I83821002d9bddb74f9ec961313878c2be94558e7
Bill Yi [Tue, 12 Jun 2018 00:22:31 +0000 (17:22 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
0be149db42 skipped:
3c2edd55ce am:
71f5cfa650 -s ours am:
f2ce740a1e -s ours am:
b10ebef583 -s ours
am:
7cea26fc9e -s ours
Change-Id: I1629396b23c0c087402a531095d4c5e5d128c3c0
Android Build Merger (Role) [Tue, 12 Jun 2018 00:16:15 +0000 (00:16 +0000)]
[automerger] Merge changes from topic "am-
da3e9584-98c5-4975-8207-
a77d2301579a" into oc-dev am:
bd9caf4c6f am:
2b605d89b9 am:
64c1873c30 am:
6dbef2a740 am:
15c7ebec8b
Change-Id: I93bab4d2aec8500d7c7df1aa1e9d9a03f454db87
Android Build Merger (Role) [Tue, 12 Jun 2018 00:15:53 +0000 (00:15 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
05238c7743 skipped:
5e66cc00a4 am:
dafe5854dd -s ours am:
0c61c9baf6 -s ours am:
7567755399 -s ours am:
287d484b23 -s ours skipped:
17f3cb9676
Change-Id: Id3708898b617eba4022e54c2c8aeac4ed9a91c42
Bill Yi [Tue, 12 Jun 2018 00:15:08 +0000 (17:15 -0700)]
Merge changes from topic "am-
da3e9584-98c5-4975-8207-
a77d2301579a" into oc-dev am:
bd9caf4c6f am:
2b605d89b9 am:
64c1873c30
am:
6dbef2a740
Change-Id: Idcb33a3c4b655c5187c0d76d34ca1609044e1d45
Bill Yi [Tue, 12 Jun 2018 00:06:07 +0000 (17:06 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
05238c7743 skipped:
5e66cc00a4 am:
dafe5854dd -s ours am:
0c61c9baf6 -s ours am:
7567755399 -s ours
am:
287d484b23 -s ours
Change-Id: I1079b3a33c1d7a2634da82ad94d2a2358cf0d6dc
TreeHugger Robot [Tue, 12 Jun 2018 00:03:11 +0000 (00:03 +0000)]
Merge "Go back to using PreferenceThemeOverlay.v14.Material"
Winson Chung [Mon, 11 Jun 2018 23:58:27 +0000 (23:58 +0000)]
Revert "Defer stop for all activities becoming invisible"
This reverts commit
b824f87c65216e4dfe5e9ab0e63795466836bc0f (for b/
80313326)
Reason for revert: Cts issues (b/
110032866)
Bug:
80313326
Bug:
110032866
Change-Id: Iaca3a8650d30b475ef4331e98b4b14377072ee4d
TreeHugger Robot [Mon, 11 Jun 2018 23:28:37 +0000 (23:28 +0000)]
Merge "Early exit if we don't have a package on record"
TreeHugger Robot [Mon, 11 Jun 2018 22:51:13 +0000 (22:51 +0000)]
Merge "Remove flag for data usage v2."
Bill Yi [Mon, 11 Jun 2018 22:43:09 +0000 (15:43 -0700)]
Merge changes from topic "am-
8bf63f1b-ab99-4537-ad90-
d648a4dd77b0" into oc-dev am:
c70d882667 am:
c262f7a96a
am:
ac40bb76a1
Change-Id: Idecbdcc5616a974fe75d99667ec4a5e8d37d97c5
Bill Yi [Mon, 11 Jun 2018 22:35:45 +0000 (15:35 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9f043e5e58 skipped:
cc2c91ba39 am:
b1615a6d90 -s ours am:
2c56e9b54b -s ours
am:
c37cca5739 -s ours
Change-Id: If954d237d06c522c78198b0fadd8c6394978855a
Brad Ebinger [Mon, 11 Jun 2018 22:24:19 +0000 (15:24 -0700)]
[automerger skipped] Merge "Update Docs to clarify using a Message across IPC"
am:
0be0692691 -s ours
Change-Id: I1d3887c7d4a868a1f1b56c0d2e4f824eef29fb3a
Bill Yi [Mon, 11 Jun 2018 22:17:06 +0000 (15:17 -0700)]
Merge changes from topic "am-
8eb97afa-063a-44e2-8d8e-
6d5670eb50b6" into oc-dev am:
836d1db239 am:
f527941ec8
am:
f4a3d1faf2
Change-Id: I5bff44b8b6e7384eada300a2c904ab11c12e028f
TreeHugger Robot [Mon, 11 Jun 2018 22:10:59 +0000 (22:10 +0000)]
Merge "Remove test-* sources for Metalava api-stubs." into pi-dev-plus-aosp
Bill Yi [Mon, 11 Jun 2018 22:09:52 +0000 (15:09 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5e25fd88a8 skipped:
c6a1d32ebe am:
6d30123999 -s ours am:
f9efc3043a -s ours
am:
9e7657c13d -s ours
Change-Id: Ie100fd774ad3262f3edf1b5b2baaa3786200dccc
Bill Yi [Mon, 11 Jun 2018 22:04:23 +0000 (15:04 -0700)]
Merge changes from topic "am-
63639373-f180-4cce-87e9-
95ef192ab9ec" into oc-dev am:
3bbe3c7c93 am:
24701167ba
am:
689cf0f8a2
Change-Id: I211002b40f5acf9f7ad0a44e4530019df72c3b7c
Android Build Merger (Role) [Mon, 11 Jun 2018 22:00:22 +0000 (22:00 +0000)]
Merge changes from topic "am-
7088e354694b4d46925399cbaf5157cc"
* changes:
Merge changes from topic "am-
84e9fe64-a976-466c-a8d7-
d25febc3ff42" into oc-dev am:
5b882b9dd7 am:
9ce893db7d am:
053160d965 am:
a5f49873c1 am:
04bdc5de63
[automerger skipped] Import translations. DO NOT MERGE skipped:
1122b10e7d skipped:
ab4ca0c33d am:
d82564708f -s ours am:
2e113959ff -s ours am:
5caff8b3ac -s ours am:
b63aa6d5bb -s ours am:
1fe5bdd91c -s ours
Bill Yi [Mon, 11 Jun 2018 21:59:34 +0000 (14:59 -0700)]
Merge changes from topic "am-
84e9fe64-a976-466c-a8d7-
d25febc3ff42" into oc-dev am:
5b882b9dd7 am:
9ce893db7d am:
053160d965 am:
a5f49873c1
am:
04bdc5de63
Change-Id: I57ab4d1ab884619cb5881955a221933ffa775ee7
Antony Sargent [Mon, 11 Jun 2018 21:59:05 +0000 (14:59 -0700)]
Go back to using PreferenceThemeOverlay.v14.Material
We temporarily need to go back to having
PreferenceThemeOverlay.SettingsBase inherit from
PreferenceThemeOverlay.v14.Material. This v14.Material version has been
deprecated in the support library source in favor of just having those
styles be what's in PreferenceThemeOverlay, but the prebuilt with those
changes hasn't made it to the master branch yet.
Bug:
110048976
Test: visual (settings should not have dividers between each Preference)
Change-Id: Id9c33f6f235b1cb39cf78830da901413f7aa6815
Bill Yi [Mon, 11 Jun 2018 21:57:09 +0000 (14:57 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
0be149db42 skipped:
3c2edd55ce am:
71f5cfa650 -s ours am:
f2ce740a1e -s ours
am:
b10ebef583 -s ours
Change-Id: Ieb35e183766df1fae623f85ccb2c3a3291b35085
TreeHugger Robot [Mon, 11 Jun 2018 21:56:53 +0000 (21:56 +0000)]
Merge "Fixed initial value for sVisibleDatasetsMaxCount."
TreeHugger Robot [Mon, 11 Jun 2018 21:56:24 +0000 (21:56 +0000)]
Merge "Only keep default constructor of manifest items"
Bill Yi [Mon, 11 Jun 2018 21:51:44 +0000 (14:51 -0700)]
Merge changes from topic "am-
da3e9584-98c5-4975-8207-
a77d2301579a" into oc-dev am:
bd9caf4c6f am:
2b605d89b9
am:
64c1873c30
Change-Id: Ie4a67f372f3a7d187a7c7fe9c5d364c460535376
Bill Yi [Mon, 11 Jun 2018 21:49:46 +0000 (14:49 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
1122b10e7d skipped:
ab4ca0c33d am:
d82564708f -s ours am:
2e113959ff -s ours am:
5caff8b3ac -s ours am:
b63aa6d5bb -s ours
am:
1fe5bdd91c -s ours
Change-Id: Icd0a2c2b2c20c2d9f6ab3653392bd81c64f017e3
Bill Yi [Mon, 11 Jun 2018 21:44:34 +0000 (14:44 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
05238c7743 skipped:
5e66cc00a4 am:
dafe5854dd -s ours am:
0c61c9baf6 -s ours
am:
7567755399 -s ours
Change-Id: If1fa2cf8485670184771de6faf7042b7c7b227eb
Bill Yi [Mon, 11 Jun 2018 21:43:19 +0000 (14:43 -0700)]
Merge changes from topic "am-
8bf63f1b-ab99-4537-ad90-
d648a4dd77b0" into oc-dev am:
c70d882667
am:
c262f7a96a
Change-Id: If96c64288656012f02de0edfd0d8cf7ff26abae4
Bill Yi [Mon, 11 Jun 2018 21:41:11 +0000 (14:41 -0700)]
Merge changes from topic "am-
f1c23412-1f54-4840-90d6-
b3eb7b06fc83" into oc-dev am:
59f13cbb8a am:
34d73a6f77 am:
331b188275 am:
a3a2117e5f
am:
8c90d25155
Change-Id: I32572b17b8cbe86cb724898297ae1bd6f33d1da1
Bill Yi [Mon, 11 Jun 2018 21:36:55 +0000 (14:36 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9f043e5e58 skipped:
cc2c91ba39 am:
b1615a6d90 -s ours
am:
2c56e9b54b -s ours
Change-Id: I947aee957d91c286204282e84162e9733ace9018
Bill Yi [Mon, 11 Jun 2018 21:31:45 +0000 (14:31 -0700)]
Merge changes from topic "am-
8eb97afa-063a-44e2-8d8e-
6d5670eb50b6" into oc-dev am:
836d1db239
am:
f527941ec8
Change-Id: I641ba8de65451ddfab0bd38dcdb09d98f1039fb1
Bill Yi [Mon, 11 Jun 2018 21:31:10 +0000 (14:31 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
ce28dfa9fa skipped:
4f7095b464 am:
124cc34793 -s ours am:
b5af202209 -s ours am:
6c409c2e99 -s ours am:
4256a29fcc -s ours
am:
eb251fe850 -s ours
Change-Id: I7593be8a92a1c1ca2e394afd3833adcba0a8ada1
Bill Yi [Mon, 11 Jun 2018 21:28:27 +0000 (14:28 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
faed2889f4 skipped:
091681e295 am:
4228af93a7 -s ours am:
fcd7cc11c7 -s ours am:
927396047c -s ours am:
73eb5fee8d -s ours
am:
b023d17f67 -s ours
Change-Id: Ic66a9d4507be10b7c09d3dc89982f2054bb1d6d2
Patrick [Mon, 11 Jun 2018 16:25:58 +0000 (09:25 -0700)]
Early exit if we don't have a package on record
In NMR1, the ability to silently uninstall orphaned packages was added.
This code path added a new throw from the uninstall flow if the package
didn't exist and resulted in uninstall of a non-existant package
printing a stack trace instead of DELETE_FAILED_INTERNAL_ERROR as it did
in prior versions. This change simply checks for the existance of the
package and fails early when no such package exist. Also moves all calls
to the observer to a post to the handler.
Change-Id: I89d1d5002ef2f37b65a6910fb366ff4a68070e6d
Fixes:
33230110
Test: unisntalled missing package
Bill Yi [Mon, 11 Jun 2018 21:25:28 +0000 (14:25 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5e25fd88a8 skipped:
c6a1d32ebe am:
6d30123999 -s ours
am:
f9efc3043a -s ours
Change-Id: Ia4ef7b14406c4f0f15b9d17d107308f93282684b
Jake Wharton [Mon, 11 Jun 2018 16:24:11 +0000 (12:24 -0400)]
Only keep methods with correct signature for view/menu click
For View's onClick attribute the method must have a single argument of type android.view.View. For a MenuItem's onClick attribute the method must have a single argument of type android.view.MenuItem. Since these rules match all types and any return type, matching by signature is the only available specificity that can be added.
Bug:
37123156
Test: make aapt2_tests
Change-Id: I4b82f5ef9e62a8ecffaab424e269df627825709e
TreeHugger Robot [Mon, 11 Jun 2018 21:12:44 +0000 (21:12 +0000)]
Merge "Allow apps to queue multiple toast messages."
Bill Yi [Mon, 11 Jun 2018 21:03:15 +0000 (14:03 -0700)]
Merge changes from topic "am-
84e9fe64-a976-466c-a8d7-
d25febc3ff42" into oc-dev am:
5b882b9dd7 am:
9ce893db7d am:
053160d965
am:
a5f49873c1
Change-Id: Iff391bdbc66ec59c30f36fc14e9501c7fb770f30
Bill Yi [Mon, 11 Jun 2018 21:01:09 +0000 (14:01 -0700)]
Merge changes from topic "am-
63639373-f180-4cce-87e9-
95ef192ab9ec" into oc-dev am:
3bbe3c7c93
am:
24701167ba
Change-Id: I2cc8202e1abaf739a71126665599c3b262f5e7d7
Bill Yi [Mon, 11 Jun 2018 20:54:34 +0000 (13:54 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
0be149db42 skipped:
3c2edd55ce am:
71f5cfa650 -s ours
am:
f2ce740a1e -s ours
Change-Id: Ibcaa1f68b57714de2a7295d93d1875274b750071
Bill Yi [Mon, 11 Jun 2018 20:54:10 +0000 (13:54 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
1122b10e7d skipped:
ab4ca0c33d am:
d82564708f -s ours am:
2e113959ff -s ours am:
5caff8b3ac -s ours
am:
b63aa6d5bb -s ours
Change-Id: I352891e21e30e5d61ac0224f69c1e3fad181d0b8
Bill Yi [Mon, 11 Jun 2018 20:49:02 +0000 (13:49 -0700)]
Merge changes from topic "am-
da3e9584-98c5-4975-8207-
a77d2301579a" into oc-dev am:
bd9caf4c6f
am:
2b605d89b9
Change-Id: I1686e2207e5764167e1e75fcbf4d0be08bf4590d
Julia Reynolds [Mon, 11 Jun 2018 20:48:54 +0000 (20:48 +0000)]
Merge "Properly consider non-blockable channels"
Bill Yi [Mon, 11 Jun 2018 20:45:54 +0000 (13:45 -0700)]
Merge changes from topic "am-
f1c23412-1f54-4840-90d6-
b3eb7b06fc83" into oc-dev am:
59f13cbb8a am:
34d73a6f77 am:
331b188275
am:
a3a2117e5f
Change-Id: I65b949695446c745048a29b24c851fcdff714010
Bill Yi [Mon, 11 Jun 2018 20:42:05 +0000 (13:42 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
05238c7743 skipped:
5e66cc00a4 am:
dafe5854dd -s ours
am:
0c61c9baf6 -s ours
Change-Id: Ie95321f3e530034575a32399abcb3d07f552c0e9
Bill Yi [Mon, 11 Jun 2018 20:36:21 +0000 (13:36 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
ce28dfa9fa skipped:
4f7095b464 am:
124cc34793 -s ours am:
b5af202209 -s ours am:
6c409c2e99 -s ours
am:
4256a29fcc -s ours
Change-Id: I1467823190040c77c1a523ee9fa6d33a64140f29
Bill Yi [Mon, 11 Jun 2018 20:33:41 +0000 (13:33 -0700)]
Merge changes from topic "am-
84e9fe64-a976-466c-a8d7-
d25febc3ff42" into oc-dev am:
5b882b9dd7 am:
9ce893db7d am:
053160d965
am:
a5f49873c1
Change-Id: Id693b92fca0b24c3df442dfa196fa3f54b5e30c7
Bill Yi [Mon, 11 Jun 2018 20:32:07 +0000 (13:32 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
faed2889f4 skipped:
091681e295 am:
4228af93a7 -s ours am:
fcd7cc11c7 -s ours am:
927396047c -s ours
am:
73eb5fee8d -s ours
Change-Id: Ia18e5250d7e91b7a9aa227fbe667c22b325eb85a
Bill Yi [Mon, 11 Jun 2018 20:24:03 +0000 (13:24 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
1122b10e7d skipped:
ab4ca0c33d am:
d82564708f -s ours am:
2e113959ff -s ours am:
5caff8b3ac -s ours
am:
b63aa6d5bb -s ours
Change-Id: I2221a29a450913ee217ce3c6e552fad33c2bf77e
Bill Yi [Mon, 11 Jun 2018 20:17:18 +0000 (13:17 -0700)]
Merge changes from topic "am-
f1c23412-1f54-4840-90d6-
b3eb7b06fc83" into oc-dev am:
59f13cbb8a am:
34d73a6f77 am:
331b188275
am:
a3a2117e5f
Change-Id: I59236b66f68d507b8e447d0bb595f099bcdd41db
Neil Fuller [Fri, 8 Jun 2018 17:44:49 +0000 (18:44 +0100)]
Simple pass-through TimeDetectorService
This is sufficient to wire up time detection from telephony
to the new service without breaking time detection.
Bug:
78217059
Test: atest FrameworksServicesTests:com.android.server.timedetector
Test: atest FrameworksCoreTests:android.util.TimestampedValueTest
Change-Id: Id7175878dc22e5272c31f3e478af4b0e4183b62b
Bill Yi [Mon, 11 Jun 2018 20:07:02 +0000 (13:07 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
ce28dfa9fa skipped:
4f7095b464 am:
124cc34793 -s ours am:
b5af202209 -s ours am:
6c409c2e99 -s ours
am:
4256a29fcc -s ours
Change-Id: I1981ce718c800250fba896c4bdd864a5ec37a708
Bill Yi [Mon, 11 Jun 2018 20:05:00 +0000 (13:05 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
faed2889f4 skipped:
091681e295 am:
4228af93a7 -s ours am:
fcd7cc11c7 -s ours am:
927396047c -s ours
am:
73eb5fee8d -s ours
Change-Id: I703ad0c542986320b6c5678b4be64333ae2629cb
Jake Wharton [Mon, 11 Jun 2018 19:40:48 +0000 (15:40 -0400)]
Improve tests for ProGuard rules, add transition tests
Test: make aapt2_tests
Change-Id: If3300a9f82ad90189b74aab03c0d7f649e74e3f3
Brad Ebinger [Mon, 11 Jun 2018 19:56:07 +0000 (19:56 +0000)]
Merge "Update Docs to clarify using a Message across IPC"
OSDN Git Service
