git.osdn.net Git - android-x86/packages-apps-Settings.git/log

(root) / android-x86 / packages-apps-Settings.git / log

Android Build Merger (Role) [Mon, 2 Apr 2018 17:45:10 +0000 (17:45 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 am: bab8dca667 am: 84061c71d1 am: 41be25548e

Change-Id: I527b0743bd4b85ddaa7c2bff32523c1876cb8859

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 17:45:08 +0000 (17:45 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 am: bab8dca667 am: 84061c71d1

Change-Id: I1a16852bc9676bf785836576bf034d0a1dc8cf4b

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 17:45:07 +0000 (17:45 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 am: bab8dca667

Change-Id: I72b65a7a76c93dff0dd5ffd9c3747c68c0a382e8

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 17:45:05 +0000 (17:45 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2

Change-Id: I501c5e16642ce2bddb0c5c5e2ed6e0b84fc34029

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 17:45:03 +0000 (17:45 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666

Change-Id: Idf0afa49507f8ead25fd1b59809064f058281076

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 17:45:02 +0000 (17:45 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7

Change-Id: I69b00aebae95532bf9fe51191b14e12d8948b0bf

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 17:45:00 +0000 (17:45 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3

Change-Id: I7c2952f8540db9ee15ceac73bf1a0d73652f5163

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 17:44:58 +0000 (17:44 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0

Change-Id: Id8ac4a63bd63d0a219364b520211ebae5ad6ea62

commit | commitdiff | tree

Hansong Zhang [Mon, 2 Apr 2018 17:42:26 +0000 (10:42 -0700)]

DO NOT MERGE Fix unexpected behavior in Bluetooth pairing

* Set default PBAP permission to false
* Remove all newline and tab characters in Bluetooth device name

Bug: 72872376
Bug: 73173182
Test: manual
Change-Id: I85f5f11c5803c3031bf9a56273c30c3ef305f63d

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Feb 2018 00:43:53 +0000 (00:43 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff skipped: ddd9cb6be9 skipped: 6827142bd1 skipped: ca801490c1

Change-Id: Ife59d44c290cc17fb50bf252e0d5018e694249f4

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Feb 2018 00:43:50 +0000 (00:43 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff skipped: ddd9cb6be9 skipped: 6827142bd1

Change-Id: I2da83a86cf8dce95f26b21c02a426d53f5db5913

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Feb 2018 00:43:46 +0000 (00:43 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff skipped: ddd9cb6be9

Change-Id: I43b0b5ebdb708b53d3df284c3f836bec85e6e028

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Feb 2018 00:43:44 +0000 (00:43 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff

Change-Id: I789abf6753a183218b5a5b3497a4496d3e3b937c

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Feb 2018 00:43:40 +0000 (00:43 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861

Change-Id: I999690b501e7fc8fb80b1d0d00b3ea325eef4247

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Feb 2018 00:43:37 +0000 (00:43 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25

Change-Id: Ib7353cdd97c4da931c3ea3502e40fc72b61c1bb8

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Feb 2018 00:43:34 +0000 (00:43 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10

Change-Id: I04c83c01dd38c7498fdd7ca4b978bab482172801

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Feb 2018 00:43:27 +0000 (00:43 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49

Change-Id: I99c6271e133bffb2e78ba1fbfbf34a3e819411a7

commit | commitdiff | tree

Antony Sargent [Tue, 13 Feb 2018 00:17:54 +0000 (16:17 -0800)]

Import translations. DO NOT MERGE

Merge translations of Bluetooth confirmation text

This is a manual merge of the translated strings from the master branch
of the 'bluetooth_pairing_shares_phonebook' string. The fix for this bug
requires these translations because the fix was to slightly reword the
confirmation text in the pairing dialog and stop substituting in the
device name.

Bug: 62672248
Test: manual
Change-Id: I43db31f1495e6873b6905896e6fa75fd88b4cb8d

commit | commitdiff | tree

Antony Sargent [Tue, 5 Dec 2017 17:32:41 +0000 (17:32 +0000)]

Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 am: 9867a3ef85
am: acacd658f1

Change-Id: If9851b0b24c020d3a10b197fc15b6777bd88401c

commit | commitdiff | tree

Antony Sargent [Tue, 5 Dec 2017 17:28:54 +0000 (17:28 +0000)]

Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407
am: 9867a3ef85

Change-Id: Ic9195106304da657092f113817ec7ad86618a2b1

commit | commitdiff | tree

Antony Sargent [Tue, 5 Dec 2017 17:26:51 +0000 (17:26 +0000)]

Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207
am: 3d7dbd6407

Change-Id: Ifa4509bbabbb346ce581f17d33e3f48fc7014971

commit | commitdiff | tree

Antony Sargent [Tue, 5 Dec 2017 17:24:48 +0000 (17:24 +0000)]

Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1
am: 24f063a207

Change-Id: I44b42f37a638cda455bbeb3ab4bab5c02fc9c7d9

commit | commitdiff | tree

Antony Sargent [Tue, 5 Dec 2017 17:21:14 +0000 (17:21 +0000)]

Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846
am: 9cf1fc73f1

Change-Id: I4906dc8f97cfcfeef7bfda0896b39c032ef26ec6

commit | commitdiff | tree

Antony Sargent [Tue, 5 Dec 2017 17:19:12 +0000 (17:19 +0000)]

Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3
am: eee62e1846

Change-Id: Ie6fff7cf9df6827a29c04473ed3a0f1332c08ff2

commit | commitdiff | tree

Antony Sargent [Tue, 5 Dec 2017 17:17:08 +0000 (17:17 +0000)]

Reword bluetooth confirmation dialog am: e14d38a383
am: b2b401b5f3

Change-Id: I21921d41d35a87a48ad627e9889e4d00219e912b

commit | commitdiff | tree

Antony Sargent [Tue, 5 Dec 2017 17:13:36 +0000 (17:13 +0000)]

Reword bluetooth confirmation dialog
am: e14d38a383

Change-Id: Ibb19504f6a74015a2a4d25d5c268db975da4ebb5

commit | commitdiff | tree

Antony Sargent [Wed, 6 Sep 2017 23:15:59 +0000 (16:15 -0700)]

Reword bluetooth confirmation dialog

Changing the text near the checkbox allowing contacts/call history
access from "Allow $device_name to access your contacts and call
history" to just "Allow access to your contacts and call history" to
avoid problem where a properly crafted remote device name can make the
"to access your contacts and call history" text get pushed down below
the fold, and mislead users into thinking the checkbox has a different
meaning.

Bug: 62672248
Test: manual (initiate bluetooth pairing with another phone or a
computer, observe pairing dialog text)

Change-Id: I770852739f6791c2b9a36ab45c526bab3f3b9be1

commit | commitdiff | tree

Fan Zhang [Fri, 3 Nov 2017 00:34:29 +0000 (00:34 +0000)]

Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours am: 1de093b1a1 -s ours am: 5f02135c42 -s ours am: 7690482014 -s ours am: dbbcf65c96 -s ours am: e6a8f354fc -s ours am: 3c19043e9c -s ours
am: d15a81f882 -s ours

Change-Id: I937296351e0da23f441dab7c0403b1d59d78a016

commit | commitdiff | tree

Fan Zhang [Fri, 3 Nov 2017 00:31:01 +0000 (00:31 +0000)]

Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours am: 1de093b1a1 -s ours am: 5f02135c42 -s ours am: 7690482014 -s ours am: dbbcf65c96 -s ours am: e6a8f354fc -s ours
am: 3c19043e9c -s ours

Change-Id: I6e25fc7111d4ec534d0588100e1dd6ce2ced5ee1

commit | commitdiff | tree

Fan Zhang [Fri, 3 Nov 2017 00:28:34 +0000 (00:28 +0000)]

Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours am: 1de093b1a1 -s ours am: 5f02135c42 -s ours am: 7690482014 -s ours am: dbbcf65c96 -s ours
am: e6a8f354fc -s ours

Change-Id: I4ea4b1a122429accdaede04201d88f16286fa4da

commit | commitdiff | tree

Fan Zhang [Fri, 3 Nov 2017 00:26:03 +0000 (00:26 +0000)]

Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours am: 1de093b1a1 -s ours am: 5f02135c42 -s ours am: 7690482014 -s ours
am: dbbcf65c96 -s ours

Change-Id: Ia7d6e53337a1b0225e8917542fa5ae9d092b1ebf

commit | commitdiff | tree

Fan Zhang [Fri, 3 Nov 2017 00:22:09 +0000 (00:22 +0000)]

Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours am: 1de093b1a1 -s ours am: 5f02135c42 -s ours
am: 7690482014 -s ours

Change-Id: Ia8925895580e9e010bee69ae638272ec7a9bad1a

commit | commitdiff | tree

Fan Zhang [Fri, 3 Nov 2017 00:19:51 +0000 (00:19 +0000)]

Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours am: 1de093b1a1 -s ours
am: 5f02135c42 -s ours

Change-Id: I97a7ff922ca6aed7f99bce5f15f104b6b7ce8411

commit | commitdiff | tree

Fan Zhang [Fri, 3 Nov 2017 00:17:43 +0000 (00:17 +0000)]

Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours
am: 1de093b1a1 -s ours

Change-Id: Ia56b40b2d0de2d993a46970d5cf1e63c8e47cd81

commit | commitdiff | tree

Fan Zhang [Fri, 3 Nov 2017 00:15:15 +0000 (00:15 +0000)]

Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours
am: b17703e871 -s ours

Change-Id: I17c1cacc0a068c4d79e4cf568152607c3e13c4c4

commit | commitdiff | tree

Fan Zhang [Fri, 3 Nov 2017 00:13:11 +0000 (00:13 +0000)]

Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev
am: 1c040c7414 -s ours

Change-Id: Ibcf00afea271d12b533042711317bb2e2356c0e9

commit | commitdiff | tree

Fan Zhang [Fri, 3 Nov 2017 00:07:32 +0000 (00:07 +0000)]

Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev

commit | commitdiff | tree

Fan Zhang [Tue, 10 Oct 2017 21:06:04 +0000 (14:06 -0700)]

Set device credential's Window flag to be SECURE.

This prevents showing any pattern/pin in recent list.

Change-Id: I445cbad99344a2fcc335a5aad4a4de026ae97441
Merged-In: Ie56f725bf245961d61a66eae8a82b728600cb650
Fixes: 64339515
Bug: 38258991
Test: manual

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 23:08:25 +0000 (23:08 +0000)]

Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 am: cd66862b08 am: 769e1e31f5 am: b4db530aa5 -s ours am: 0c0728a947 -s ours am: 4d9e11990d -s ours am: 3d94477fb8 -s ours
am: 9d865d0c3e -s ours

Change-Id: Ic2de72b09edc9f4a1a2c5be6ae9b12099eb9ae62

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 23:04:53 +0000 (23:04 +0000)]

Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 am: cd66862b08 am: 769e1e31f5 am: b4db530aa5 -s ours am: 0c0728a947 -s ours am: 4d9e11990d -s ours
am: 3d94477fb8 -s ours

Change-Id: If5fd35415471ddb7a07899d7fff170fe63dd7dca

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 23:02:45 +0000 (23:02 +0000)]

Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 am: cd66862b08 am: 769e1e31f5 am: b4db530aa5 -s ours am: 0c0728a947 -s ours
am: 4d9e11990d -s ours

Change-Id: Ic7eec070d6a3f352b15b6a6e9b82af93fcbf4403

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 23:00:42 +0000 (23:00 +0000)]

Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 am: cd66862b08 am: 769e1e31f5 am: b4db530aa5 -s ours
am: 0c0728a947 -s ours

Change-Id: Ia44221b7d0e556ce26b3e50a91d68b90b6453228

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 22:59:07 +0000 (22:59 +0000)]

Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 am: cd66862b08 am: 769e1e31f5
am: b4db530aa5 -s ours

Change-Id: Ia9e4b612cfe9efffbad24a8a123b48dbcb6bb13d

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 22:57:12 +0000 (22:57 +0000)]

Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 am: cd66862b08
am: 769e1e31f5

Change-Id: Ie3cf781e84803ef5e602e8885fe018a2bba993e4

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 22:54:07 +0000 (22:54 +0000)]

Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613
am: cd66862b08

Change-Id: I46830f9d58174aafa138bee67b60e52d0578594b

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 22:50:43 +0000 (22:50 +0000)]

Merge "Set device credential's Window flag to be SECURE." into mnc-dev
am: 8bffdc2613

Change-Id: Ie06476c8e34cbf17f4538a477894b7bca1bdfcbd

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 22:47:13 +0000 (22:47 +0000)]

Merge "Set device credential's Window flag to be SECURE." into mnc-dev

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 21:23:57 +0000 (21:23 +0000)]

Merge "Set device credential's Window flag to be SECURE." into nyc-dev am: e69c4dcb8f am: e79c26a9da am: 80af194f8b
am: adabc7561b

Change-Id: I58bf359a98fc0b6ceb06cf4a5e83cedabfa6a0f3

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 21:21:53 +0000 (21:21 +0000)]

Merge "Set device credential's Window flag to be SECURE." into nyc-dev am: e69c4dcb8f am: e79c26a9da
am: 80af194f8b

Change-Id: Iecfc5f05f9ede225800d12416508d71f7aeb46c0

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 21:16:32 +0000 (21:16 +0000)]

Merge "Set device credential's Window flag to be SECURE." into nyc-dev am: e69c4dcb8f
am: e79c26a9da

Change-Id: I3652f6f77479a339b9acc387a49ee96fe70921ff

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 21:11:26 +0000 (21:11 +0000)]

Merge "Set device credential's Window flag to be SECURE." into nyc-dev
am: e69c4dcb8f

Change-Id: I30a0d2578343a7635da63a52cfc81f1427aab23b

commit | commitdiff | tree

Fan Zhang [Fri, 22 Sep 2017 18:25:42 +0000 (11:25 -0700)]

Set device credential's Window flag to be SECURE.

This prevents showing any pattern/pin in recent list.

Change-Id: Ie56f725bf245961d61a66eae8a82b728600cb650
Fixes: 64339515
Bug: 38258991
Merged-In: Ife33131004d66092bfa57aa57a9bb856800ce28d
Merged-In: Ia9935ef710cf1795d9ce464e0a9edff75be9c0c3
Merged-In: I99c283dd4a1f2d579f565ccf5839a705e75ed6fc
Merged-In: Ibe781a3a1e1483a8c6fde4c7cc5dffbf54bdba59
Test: manual

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 21:03:08 +0000 (21:03 +0000)]

Merge "Set device credential's Window flag to be SECURE." into nyc-dev

commit | commitdiff | tree

Fan Zhang [Fri, 22 Sep 2017 16:32:02 +0000 (09:32 -0700)]

Set device credential's Window flag to be SECURE.

This prevents showing any pattern/pin in recent list.

Change-Id: Ife33131004d66092bfa57aa57a9bb856800ce28d
Fixes: 64339515
Bug: 38258991
Merged-In: Ia9935ef710cf1795d9ce464e0a9edff75be9c0c3
Merged-In: I99c283dd4a1f2d579f565ccf5839a705e75ed6fc
Merged-In: Ibe781a3a1e1483a8c6fde4c7cc5dffbf54bdba59
Test: manual

commit | commitdiff | tree

Jeff Sharkey [Wed, 18 Oct 2017 20:40:16 +0000 (20:40 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours am: 45fc104958 -s ours am: 19fa568b39 am: 2bf724509c am: a954c8c716 am: 91b1cb4b23 -s ours am: 07c4c8efed am: d88820f3f6 am: 629553fb49
am: 397a3555b5

Change-Id: I1cd5d59bfbb91806e18f9d33f1ccd897f99c745e

commit | commitdiff | tree

Jeff Sharkey [Wed, 18 Oct 2017 20:39:11 +0000 (20:39 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours am: 5b2a431787 am: 9ba609cef9 am: c1ebc09ff0 am: fad1e6a315 -s ours am: 416ecb20a3 am: e341fe95bd am: 85cb0b43da
am: 8f2a69fad3

Change-Id: If4e97b0c8efd7223323f36954e2eb80aabeb881c

commit | commitdiff | tree

Jeff Sharkey [Wed, 18 Oct 2017 20:26:31 +0000 (20:26 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours am: 45fc104958 -s ours am: 19fa568b39 am: 2bf724509c am: a954c8c716 am: 91b1cb4b23 -s ours am: 07c4c8efed am: d88820f3f6
am: 629553fb49

Change-Id: I075b5225e91a419fbe5d5f6ecdbbf82ba5f1c550

commit | commitdiff | tree

Jeff Sharkey [Wed, 18 Oct 2017 20:25:25 +0000 (20:25 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours am: 5b2a431787 am: 9ba609cef9 am: c1ebc09ff0 am: fad1e6a315 -s ours am: 416ecb20a3 am: e341fe95bd
am: 85cb0b43da

Change-Id: Ic41907e9ca799e53b7796b25c5cfc818636988aa

commit | commitdiff | tree

Jeff Sharkey [Wed, 18 Oct 2017 20:06:55 +0000 (20:06 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours am: 45fc104958 -s ours am: 19fa568b39 am: 2bf724509c am: a954c8c716 am: 91b1cb4b23 -s ours am: 07c4c8efed
am: d88820f3f6

Change-Id: If92103e13bdefcaeda54adfc6acf96352b57cd89

commit | commitdiff | tree

Jeff Sharkey [Wed, 18 Oct 2017 20:06:00 +0000 (20:06 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours am: 5b2a431787 am: 9ba609cef9 am: c1ebc09ff0 am: fad1e6a315 -s ours am: 416ecb20a3
am: e341fe95bd

Change-Id: Ifc18f5afec1707d19224428ac88399d7463adf9c

commit | commitdiff | tree

Jeff Sharkey [Wed, 18 Oct 2017 19:40:12 +0000 (19:40 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours am: 45fc104958 -s ours am: 19fa568b39 am: 2bf724509c am: a954c8c716 am: 91b1cb4b23 -s ours
am: 07c4c8efed

Change-Id: I7b2baeb9b01b6b9a3f2ab6ed7444601b703e001f

commit | commitdiff | tree

Jeff Sharkey [Wed, 18 Oct 2017 19:39:10 +0000 (19:39 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours am: 5b2a431787 am: 9ba609cef9 am: c1ebc09ff0 am: fad1e6a315 -s ours
am: 416ecb20a3

Change-Id: I152a5dc22a05e3952f3b0bd162f2826580a26db2

commit | commitdiff | tree

Jeff Sharkey [Wed, 18 Oct 2017 19:27:49 +0000 (19:27 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours am: 45fc104958 -s ours am: 19fa568b39 am: 2bf724509c am: a954c8c716
am: 91b1cb4b23 -s ours

Change-Id: I5d27e57aed8586fd203bc6dacca480e97ab9ca25

commit | commitdiff | tree

Jeff Sharkey [Wed, 18 Oct 2017 19:27:11 +0000 (19:27 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours am: 5b2a431787 am: 9ba609cef9 am: c1ebc09ff0
am: fad1e6a315 -s ours

Change-Id: I46e94b20903455f26c62922aa735276434dc1fd0

commit | commitdiff | tree

Jeff Sharkey [Wed, 18 Oct 2017 19:21:53 +0000 (19:21 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours am: 45fc104958 -s ours am: 19fa568b39 am: 2bf724509c
am: a954c8c716

Change-Id: I7ae7ab6c40fdcce484c39bdd3314dd4c831b3545

commit | commitdiff | tree

Jeff Sharkey [Wed, 18 Oct 2017 19:20:50 +0000 (19:20 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours am: 5b2a431787 am: 9ba609cef9
am: c1ebc09ff0

Change-Id: I8f4e5fbc1952b6c7014fbc8c7abac5fcf54af520

commit | commitdiff | tree

Jeff Sharkey [Wed, 18 Oct 2017 18:57:57 +0000 (18:57 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours am: 45fc104958 -s ours am: 19fa568b39
am: 2bf724509c

Change-Id: Ia037ac67d83799f104cd30b6caaaad8485ae0326

commit | commitdiff | tree

Jeff Sharkey [Wed, 18 Oct 2017 18:57:03 +0000 (18:57 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours am: 5b2a431787
am: 9ba609cef9

Change-Id: I9148b6352ab44e21e3a81a4d1bc783c867d614e8

commit | commitdiff | tree

Jeff Sharkey [Wed, 18 Oct 2017 18:40:10 +0000 (18:40 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours am: 45fc104958 -s ours
am: 19fa568b39

Change-Id: Id8d333be6d14dac643447f1310629a1adc0fc2cc

commit | commitdiff | tree

Jeff Sharkey [Wed, 18 Oct 2017 18:39:25 +0000 (18:39 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours
am: 5b2a431787

Change-Id: Ie5d9d4c5e7f0d9829ad807e7a43edd2d81001aaf

commit | commitdiff | tree

Jeff Sharkey [Wed, 18 Oct 2017 18:29:15 +0000 (18:29 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours
am: 45fc104958 -s ours

Change-Id: Ibdd0283a40c9d8994b902f31ed2a80ff894384eb

commit | commitdiff | tree

Jeff Sharkey [Wed, 18 Oct 2017 18:28:28 +0000 (18:28 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am: 4cfc684346 -s ours

Change-Id: I16f3a2141ed4773b043e9d5553c7eb44e296b428

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 23:03:25 +0000 (23:03 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am: 5ef2cfac97 -s ours

Change-Id: I5b16d712ea2e7b7c98ccef5fc74fa47527e588e0

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 21:34:11 +0000 (21:34 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours am: 004f90f35e am: 86cc9a681d am: d721694b79
am: 2433b6dc44

Change-Id: I3e2938793111b4b547d4a70ebbf57b8e8f57fd37

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 21:33:01 +0000 (21:33 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours am: 89791cb5c3 am: b3d4bc8239 am: 53a69985b3
am: 3aa36a6afb

Change-Id: I8f5d74a40d179512466a3d2e77416b5222da01e7

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 21:21:40 +0000 (21:21 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours am: 004f90f35e am: 86cc9a681d
am: d721694b79

Change-Id: Ie3b5bc22af9ddbf47c6236d40a21d8bc051599be

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 21:20:09 +0000 (21:20 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours am: 89791cb5c3 am: b3d4bc8239
am: 53a69985b3

Change-Id: Icadeebe688c38f4e4d0b190ed07acd7d5396aef3

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 21:01:29 +0000 (21:01 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours am: 004f90f35e
am: 86cc9a681d

Change-Id: I30d07aff1d361734e7a962dd89d1935137ed64dd

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 21:00:27 +0000 (21:00 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours am: 89791cb5c3
am: b3d4bc8239

Change-Id: I02141baa2a53d2982856052a923be6ddd076c55f

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 20:57:51 +0000 (20:57 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf am: 979efb53d0
am: fe1daa6eda

Change-Id: I943b70a1dfc085ff0a4e4e46afb29aec1aa6c965

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 20:46:28 +0000 (20:46 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours
am: 004f90f35e

Change-Id: I2665557fb25ced0978a90fed4edff989011e01ed

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 20:45:04 +0000 (20:45 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours
am: 89791cb5c3

Change-Id: Ie179a077b08e79040603c467e0a912731636e2f2

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 20:44:53 +0000 (20:44 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf
am: 979efb53d0

Change-Id: Iad023fb1a0ff8fded7963b5e7087457803fe213c

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 20:35:23 +0000 (20:35 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7
am: ba66bb8a43 -s ours

Change-Id: I3431178e94b81aa61b7f829217a40fdee4eac141

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 20:34:40 +0000 (20:34 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb
am: 45926efd0f -s ours

Change-Id: Ieeea7848f879564074e1fb32d4c5c834d21e63cc

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 20:32:38 +0000 (20:32 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab
am: 95bbef26d7

Change-Id: I32314303ab0926d93ae035166e323bcce847b7bd

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 20:31:41 +0000 (20:31 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499
am: 556688abdb

Change-Id: Ia7daf15c3d9fc81ae8fdef25f79cc13558639e98

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 20:29:25 +0000 (20:29 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d
am: 7c41707eaf

Change-Id: Ifc8c25371b0d2062e4c51ee6fcbf75e275331b30

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 20:28:13 +0000 (20:28 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188
am: e38a7f42ab

Change-Id: I9fffe94faecb7d36ac68ebfc388af01e4871031e

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 20:28:11 +0000 (20:28 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d
am: 0bcee25346

Change-Id: I22114cc686a52c94234fbbc659998ab183c1747d

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 20:26:40 +0000 (20:26 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am: 019f31b499

Change-Id: I755c046ad6392a7582d5afc32bd1e4693bcae33e

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 20:25:11 +0000 (20:25 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am: f32a4fad5d

Change-Id: I54e65289ff205196bd4fba9f0d40dc1f9f116e2b

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 20:24:31 +0000 (20:24 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am: 94e678c188

Change-Id: Iffc23a1e80389d1afe9b10a7e992d9d19a33fe11

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 20:24:16 +0000 (20:24 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am: 1cdc675d7d

Change-Id: I117d8a1f9ab46f375277511da8f59df2db771cb7

commit | commitdiff | tree