OSDN Git Service
Xin Li [Thu, 7 Dec 2017 04:36:38 +0000 (04:36 +0000)]
DO NOT MERGE: Merge Oreo MR1 into master
am:
7b017d5a2f -s ours
Change-Id: I38ef4306a74fb9c1ca39903d5a74df5db0753290
Xin Li [Wed, 6 Dec 2017 19:52:09 +0000 (11:52 -0800)]
DO NOT MERGE: Merge Oreo MR1 into master
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: Iab7fd863c422780055277093cb9621197e09d969
Jordan Liu [Mon, 4 Dec 2017 23:45:57 +0000 (23:45 +0000)]
Merge "Hide signal strength when told by carrier"
am:
9afa720abe
Change-Id: I64b6eece29d475d8fdbaf8f6d1fb2c62701fd6e4
Jordan Liu [Mon, 4 Dec 2017 23:20:31 +0000 (23:20 +0000)]
Merge "Hide signal strength when told by carrier"
TreeHugger Robot [Thu, 30 Nov 2017 20:59:07 +0000 (20:59 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Hemant Gupta [Thu, 30 Nov 2017 17:40:31 +0000 (17:40 +0000)]
Merge "Bluetooth: Give PBAP permission only if device is AUDIO_VIDEO_HANDSFREE"
am:
b21a10b2ff
Change-Id: Id0378b1c410afcc0566652e3308cd812dcd68470
Treehugger Robot [Thu, 30 Nov 2017 17:38:01 +0000 (17:38 +0000)]
Merge "Bluetooth: Give PBAP permission only if device is AUDIO_VIDEO_HANDSFREE"
Bill Yi [Thu, 30 Nov 2017 12:05:41 +0000 (04:05 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
69925163
Change-Id: I4c880093e20e7178ce80006b158fefd490b4e061
Hemant Gupta [Fri, 22 Sep 2017 06:54:14 +0000 (12:24 +0530)]
Bluetooth: Give PBAP permission only if device is AUDIO_VIDEO_HANDSFREE
Step by step:
1. Pair and connect with BTHS (e.g. SBH50).
2. Click the settings icon of paired device, and check "Use for" items.
-----------------------------------------------------------------
Expected Result:
After step 2, "Contact sharing" should not be checked.
Actual Result:
After step 2, "Contact sharing" is checked.
Fix:
Set phone book permission as REJECTED if class of Device is
not AUDIO_VIDEO_HANDSFREE
Test: Checked above usecase and issue is not observed
Bug:
64372703
Change-Id: I178a09dd9e76d67c461c4b04d9b2ee0078ed24c9
Patrik Bannura [Fri, 24 Nov 2017 11:33:24 +0000 (12:33 +0100)]
Hide signal strength when told by carrier
Bug:
69730732
Test: Add different values for two carriers in vendor.xml
and see them change when swapping sim card
Depends-On: I155c8f619a451edab85cf6422cef73e8e1686629
Change-Id: I241ddb3c20002db781308d94c6c165b8d13b2474
Malcolm Chen [Wed, 29 Nov 2017 00:31:49 +0000 (00:31 +0000)]
Merge "Remove extra newline in AndroidManifest."
am:
8aeb69396d
Change-Id: I36ea57db56ff985da118fb7ab117bf939b7b2dc1
Treehugger Robot [Wed, 29 Nov 2017 00:22:47 +0000 (00:22 +0000)]
Merge "Remove extra newline in AndroidManifest."
songkailun [Wed, 22 Nov 2017 18:49:59 +0000 (18:49 +0000)]
Merge "DO NOT MERGE translate arrays in Settings/res"
am:
992a4e5500 -s ours
Change-Id: Ia5c69f39d1796acd79e453744cc7e5c487c43042
Treehugger Robot [Wed, 22 Nov 2017 18:36:14 +0000 (18:36 +0000)]
Merge "DO NOT MERGE translate arrays in Settings/res"
songkailun [Tue, 14 Nov 2017 13:57:20 +0000 (21:57 +0800)]
DO NOT MERGE translate arrays in Settings/res
"None" should be translated
Change-Id: I12a30e6476ec41c2a3bf1878d6b5596bf5ee8ed7
Signed-off-by: songkailun <songkailun@xiaomi.com>
Malcolm Chen [Fri, 14 Jul 2017 00:59:58 +0000 (17:59 -0700)]
Remove extra newline in AndroidManifest.
Remove extra newline in AndroidManifest which caused
android.settings.MOBILE_DATA_USAGE not received.
Bug: b/
63670955
Test: testcase MobileDataUsageActivityTest
Change-Id: I4a4178141010b128e3d9c8c9721a51b81cbdffff
jackqdyulei [Tue, 21 Nov 2017 16:41:50 +0000 (16:41 +0000)]
Merge "Add owners to setting packages."
am:
f82cd59476
Change-Id: Ic7c94f6ba65149cdc799332a0cc5976ff285f16f
Treehugger Robot [Tue, 21 Nov 2017 16:35:30 +0000 (16:35 +0000)]
Merge "Add owners to setting packages."
Malcolm Chen [Tue, 21 Nov 2017 00:48:50 +0000 (00:48 +0000)]
Merge "Add an activity that starts DataUsageList fragment for mobile."
am:
942d418da9 -s ours
Change-Id: I23e52f28f5e0873094476eda4698677e4c736f4e
jackqdyulei [Mon, 11 Sep 2017 19:44:27 +0000 (12:44 -0700)]
Add owners to setting packages.
Bug:
65294119
Fixes:
69384604
Test: Build
Change-Id: Ib4fddc1f04087671d8445fd967d4262287e5c4f3
Merged-In: I927052a73f639d0894600611cd5c79293f43ff5e
Merged-In: Ia1eb8155f2d4359d56b0babd474083295ba38a0b
Merged-In: I24ec103ff5013ad416e3dfb1c548acd387b4ba64
Merged-In: If9fddc8b4e2e6d4d7db185ab16063e824323b9a7
Merged-In: I49159950521a013422b1087ea2c3e6cd5151457c
Merged-In: I69af58183c5b89af96c1a8808665fa506a620012
Merged-In: Ie9492f497824cd2b2727dde9d3a48452c72f1084
Merged-In: I2fd0249fd8b555e5ca93c3aec13857e6c74e157c
Merged-In: Id1c2d9233643a18c1e104255a9e2b8b1aaefc44e
Merged-In: Icdcfaaf6cc7a1e1cf77e89a79d0425cab4405ffc
Merged-In: I697528ff260a0f8e54aa1188e35143e668800e7d
Merged-In: I1486782f476acaf1e2e4b66df57869409239986f
Merged-In: I804b50a38c877da80b5ef3251e16029259014152
Merged-In: I39eec9ebc1db2dc14669f27b17624394e25eb47f
Merged-In: I054a6df08046cda1c2f202390ed24839a6b10349
Merged-In: I9da5bd71ed6aa3922a7f2e2ac4729e3247a204ce
Merged-In: I63778c68f1ab9edc36a9e12aa1729f8fd6a5e073
Treehugger Robot [Tue, 21 Nov 2017 00:35:41 +0000 (00:35 +0000)]
Merge "Add an activity that starts DataUsageList fragment for mobile."
Jie Cheng [Thu, 16 Nov 2017 20:18:44 +0000 (20:18 +0000)]
Merge "Preference SimSettingsActivity not aligned correctly"
am:
8d3d166823
Change-Id: I67a977b974ddbf42b01647e4ca02d7d9dfe1b61d
Treehugger Robot [Thu, 16 Nov 2017 20:14:27 +0000 (20:14 +0000)]
Merge "Preference SimSettingsActivity not aligned correctly"
Jie Cheng [Mon, 25 Sep 2017 05:54:55 +0000 (13:54 +0800)]
Preference SimSettingsActivity not aligned correctly
The preference SimSettingsActivity in the screen "Network & Internet"
never uses a summary. However the text for this preference ("SIM cards")
is top aligned in order to make room for an extra line for the
non-existing summary.
Solved by setting the summary to @string/summary_empty for the
preference SimSettingsActivity. This will make the text in the
preference to align correctly and not leave extra room for a summary.
Test: manual - Checked that preference SimSettingsActivity is correctly
aligned in screen "Network & Internet".
Bug:
69405185
Change-Id: I1a1b3fa7253bbf2a5299f54cc8c4d3e857ca059c
Fan Zhang [Thu, 16 Nov 2017 01:33:31 +0000 (01:33 +0000)]
Merge "Catch exception when checking WifiDisplay availability"
am:
7a08901d1b
Change-Id: I426208a605e3771238bd91c135e47faf1b559e58
Treehugger Robot [Thu, 16 Nov 2017 01:27:57 +0000 (01:27 +0000)]
Merge "Catch exception when checking WifiDisplay availability"
Fan Zhang [Thu, 19 Oct 2017 23:49:21 +0000 (16:49 -0700)]
Catch exception when checking WifiDisplay availability
Change-Id: Ic2f17905babf43e92a825b8b5b4f8aac7d8ff001
Fixes:
68013053
Test: robotests
Bruno Martins [Wed, 15 Nov 2017 21:54:16 +0000 (21:54 +0000)]
Merge "Settings: Add notification channel for SIM selection"
am:
c543d5ba26
Change-Id: I72ac5944b8b4dc3eb2ad38c89ec8eb12f83b019d
Treehugger Robot [Wed, 15 Nov 2017 21:45:41 +0000 (21:45 +0000)]
Merge "Settings: Add notification channel for SIM selection"
Bruno Martins [Fri, 10 Nov 2017 13:58:46 +0000 (13:58 +0000)]
Settings: Add notification channel for SIM selection
Change-Id: I9318311fd6378a82050bb1604c29f0af2501c8b7
Xin Li [Mon, 13 Nov 2017 23:18:37 +0000 (15:18 -0800)]
Merge commit '
937ede14d84c2093f831ff8adab96dca207ad742' from
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master
Change-Id: I91ee596e3800726445cfff5dd784bae9dfdad3ee
Merged-In: I91c48c73287a271bd6c99e60e216dead22e68764
Malcolm Chen [Tue, 20 Jun 2017 18:14:27 +0000 (11:14 -0700)]
Add an activity that starts DataUsageList fragment for mobile.
We are providing an itent and a corresponding activity to show
"Mobile data usage" fragment, so that "Mobile network setting"
who lives in phone apk can use that intent to open it.
Bug:
62201918
Test: Manual
Change-Id: I862f8bc90f9456f91b436d26472cce23c837a777
Merged-In: I862f8bc90f9456f91b436d26472cce23c837a777
tiansiming [Mon, 13 Nov 2017 19:50:06 +0000 (19:50 +0000)]
Merge "Modify Comparator in ZonePicker"
am:
3c03207f9f
Change-Id: I1c2ebde217a793091ff28f9b2b1850beeb494d52
Treehugger Robot [Mon, 13 Nov 2017 19:45:10 +0000 (19:45 +0000)]
Merge "Modify Comparator in ZonePicker"
tiansiming [Mon, 30 Oct 2017 13:39:48 +0000 (21:39 +0800)]
Modify Comparator in ZonePicker
The previous method "compareTo" isn't locale-sensitive, it cannot
sort the String in some other languages. So Collator is recommended
to be applyed here.
Bug: Sort doesn't work in some languages.
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=ZonePickerComparatorTest
Change-Id: Id107ab938cceefc77f9fb6918a0445fc92a0fcb7
Signed-off-by: tiansiming <tiansiming@xiaomi.com>
Yoshinori Hirano [Fri, 10 Nov 2017 15:14:43 +0000 (15:14 +0000)]
Merge "Send broadcast when location mode is about to change DO NOT MERGE"
am:
1c05be48ae -s ours
Change-Id: Ia443491992c0b28a15d93ca344e9b20c0a111548
Treehugger Robot [Fri, 10 Nov 2017 15:07:04 +0000 (15:07 +0000)]
Merge "Send broadcast when location mode is about to change DO NOT MERGE"
Yoshinori Hirano [Tue, 24 Oct 2017 08:52:23 +0000 (17:52 +0900)]
Send broadcast when location mode is about to change DO NOT MERGE
Send "com.android.settings.location.MODE_CHANGING" broadcast intent
when the location mode is about to be changed on Settings app or
Quick Settings.
Fixes:
28057031
Test: manual - turn the location setting on
Change-Id: Icd1049259403999a30263cc866698795b44f9b2e
songkailun [Thu, 9 Nov 2017 21:19:30 +0000 (21:19 +0000)]
Merge "remove unused code in PrivacySettings"
am:
abd78cc6b3
Change-Id: I8772066bf9bf759628f1937ca1949086a8ff8509
Treehugger Robot [Thu, 9 Nov 2017 21:11:22 +0000 (21:11 +0000)]
Merge "remove unused code in PrivacySettings"
songkailun [Thu, 9 Nov 2017 20:53:10 +0000 (20:53 +0000)]
Merge "translate array in res/values-ar"
am:
0df2c8fbb7
Change-Id: Ic6175d77665dddd9ccaee29b94be3a11025f45c9
Treehugger Robot [Thu, 9 Nov 2017 20:40:18 +0000 (20:40 +0000)]
Merge "translate array in res/values-ar"
songkailun [Tue, 7 Nov 2017 11:28:55 +0000 (19:28 +0800)]
remove unused code in PrivacySettings
factory_reset is already removed from privacy_settings.xml,
so it need to be removed from PrivacySettings.java too
Change-Id: I0d295b90173102efb962dde496cf7a8b15d1e0a9
Signed-off-by: songkailun <songkailun@xiaomi.com>
songkailun [Tue, 7 Nov 2017 11:49:09 +0000 (19:49 +0800)]
translate array in res/values-ar
"None" should be translated
Change-Id: I9cd1b21947834a070ba66a7ee7641d0b6617de52
Signed-off-by: songkailun <songkailun@xiaomi.com>
Erik Kline [Tue, 7 Nov 2017 06:00:15 +0000 (06:00 +0000)]
Merge "Replace dns_tls with private_dns_mode setting"
am:
ca92fb5e2b
Change-Id: I58c44a04ef75d025f63e9470ed9624a437a7956c
Treehugger Robot [Tue, 7 Nov 2017 05:54:28 +0000 (05:54 +0000)]
Merge "Replace dns_tls with private_dns_mode setting"
Erik Kline [Mon, 30 Oct 2017 06:30:18 +0000 (15:30 +0900)]
Replace dns_tls with private_dns_mode setting
Also includes:
- new layout fragment for private DNS configuration
- PrivateDnsModeDialogPreference handler class
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- manual interaction with private dns developer option works
Bug:
34953048
Bug:
6413396
Change-Id: I3a5490c21f7f3b3e523a247c287f213d19b75a8b
Malcolm Chen [Thu, 2 Nov 2017 00:48:12 +0000 (00:48 +0000)]
Merge "Updates strings for "Emergency broadcast"."
am:
b13f2e0fb0
Change-Id: I5b17156c3fd9fa680dc872ddbcab6dd8ac30a87e
Treehugger Robot [Thu, 2 Nov 2017 00:42:48 +0000 (00:42 +0000)]
Merge "Updates strings for "Emergency broadcast"."
Malcolm Chen [Mon, 5 Jun 2017 21:51:37 +0000 (14:51 -0700)]
Updates strings for "Emergency broadcast".
Replace "Emergency broadcast" with "Emergency alerts" to be
consistent.
Test: manual
Bug: b/
62291344
Change-Id: I79d6f1162d4c112dedf49a3b43ec26011adba9bf
Jeff Sharkey [Tue, 31 Oct 2017 22:24:12 +0000 (22:24 +0000)]
Merge "Change storage migration to use quota APIs."
am:
a0afdb0c49
Change-Id: Ie97a6001eb23314c65aff291f53cf575b7637870
Fan Zhang [Tue, 31 Oct 2017 22:23:15 +0000 (22:23 +0000)]
Merge "Add a readme with instructions on running tests"
am:
08217cbd4b
Change-Id: I654b6bf10ca75715e433d1382756e380723ae324
Treehugger Robot [Tue, 31 Oct 2017 21:47:19 +0000 (21:47 +0000)]
Merge "Change storage migration to use quota APIs."
Treehugger Robot [Tue, 31 Oct 2017 21:42:28 +0000 (21:42 +0000)]
Merge "Add a readme with instructions on running tests"
Fan Zhang [Tue, 31 Oct 2017 19:57:02 +0000 (12:57 -0700)]
Add a readme with instructions on running tests
Test: is a test
Change-Id: I5f3a4745a1b2376259b2aab8df58d8660c3fe0bc
Jeff Sharkey [Thu, 6 Jul 2017 17:29:24 +0000 (11:29 -0600)]
Change storage migration to use quota APIs.
New quota APIs are much faster than trying to measure manually, and
removing this last user of calculateDirectorySize() means we can
remove it once and for all.
(cherry picked from commit
fc522c677d2bcb4835f799b39993c69f4c222e55)
Bug:
36056324
Test: builds, boots
Merged-In: Icdf774cff520a4b7ca6ec210b34a1c5ff85f8110
Change-Id: Icdf774cff520a4b7ca6ec210b34a1c5ff85f8110
xiyuan.wang [Mon, 30 Oct 2017 18:03:09 +0000 (18:03 +0000)]
Merge "Fix app crash while adding new user"
am:
1e5cd4c3df
Change-Id: I0cb1c3a228b85edb6303d4f6c33037e4f787f550
Treehugger Robot [Mon, 30 Oct 2017 17:43:46 +0000 (17:43 +0000)]
Merge "Fix app crash while adding new user"
xiyuan.wang [Fri, 20 Oct 2017 09:59:58 +0000 (17:59 +0800)]
Fix app crash while adding new user
Settings app crashes when tapping Home key while adding new user because
UserSettings#showDialog() is called after onSaveInstanceState().
To fix this issue, a dialog should not be shown after onPause().
Fixes:
68485787
Test: manual - tap Home key while adding new user
Change-Id: I2ddd119b6558927798a52c7977e6fd8137734c93
Qi Ding [Fri, 27 Oct 2017 18:47:40 +0000 (18:47 +0000)]
Merge "Fix current tab is changed when rotating device"
am:
3d8b442e8d
Change-Id: I4f8499492b7fbe26e40da649e38ab0a65667e55d
Treehugger Robot [Fri, 27 Oct 2017 18:38:37 +0000 (18:38 +0000)]
Merge "Fix current tab is changed when rotating device"
Qi Ding [Tue, 21 Jun 2016 11:16:57 +0000 (19:16 +0800)]
Fix current tab is changed when rotating device
Even if SIM slot 2 is selected in SIM card lock settings,
the current tab is changed to SIM slot 1 when rotating the device.
To fix this issue, the current tab should be restored
after rotating the device.
Fixes:
63690125
Test: manual - go to Settings > Security > SIM card lock
and rotate device
Change-Id: I874d4d06019e21dd7b65951a3aefb75ff5ea298b
Bill Yi [Tue, 24 Oct 2017 20:33:44 +0000 (20:33 +0000)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am:
aa8a972ea3
Change-Id: I778b023dfa65b0e4a8ab681c77a6a98c48184e93
Fan Zhang [Tue, 24 Oct 2017 20:33:03 +0000 (20:33 +0000)]
Merge "Fix wrong position of cursor in OwnerInfoSettings"
am:
2bcbc35b29
Change-Id: I37d5d73c9dc2dc64c6437c8e1a2786df616ee2f6
Bill Yi [Tue, 24 Oct 2017 18:32:26 +0000 (11:32 -0700)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Fan Zhang [Tue, 24 Oct 2017 18:13:25 +0000 (18:13 +0000)]
Merge "Fix wrong position of cursor in OwnerInfoSettings"
tiansiming [Tue, 24 Oct 2017 09:19:27 +0000 (17:19 +0800)]
Fix wrong position of cursor in OwnerInfoSettings
Bug:N/A
Test:Settings -> Security -> right settings icon of Screen lock
-> Lock screen message.
The cursor shows at the forefront of this EditText.
Change-Id: I86fe1bdbe78f700053e38b0cba4a5c8365af946e
Signed-off-by: tiansiming <tiansiming@xiaomi.com>
Jack Yu [Fri, 20 Oct 2017 19:30:29 +0000 (19:30 +0000)]
Merge "Refactored area update info support"
am:
60d6ffbc6c
Change-Id: I955c44c5d2c07dee0be7ae9990c0234eb989538f
Treehugger Robot [Fri, 20 Oct 2017 19:19:09 +0000 (19:19 +0000)]
Merge "Refactored area update info support"
TreeHugger Robot [Fri, 20 Oct 2017 15:28:33 +0000 (15:28 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Ben Schwartz [Fri, 20 Oct 2017 15:06:10 +0000 (15:06 +0000)]
Merge "Add a developer option for controlling DNS over TLS"
am:
c8207de343
Change-Id: I688d2131294c2b4995d7f8f79e7819feb89573c3
Treehugger Robot [Fri, 20 Oct 2017 14:58:39 +0000 (14:58 +0000)]
Merge "Add a developer option for controlling DNS over TLS"
Bill Yi [Fri, 20 Oct 2017 10:21:50 +0000 (03:21 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
68003463
Change-Id: Id09f849aa6cdf8d983697e7a6a7f182c5f76e623
Jack Yu [Thu, 22 Jun 2017 00:43:43 +0000 (17:43 -0700)]
Refactored area update info support
1. Refactored area update information support so it
is not limited to channel 50 and Brazil.
2. Added channel 60 for India.
Test: Manual
bug:
37746109
Change-Id: I470cc470f880aadd4f63815e21cdd4a71436a89d
(cherry picked from commit
c3cab8ecb84051abac144aaa0f94ee9276c89aab)
tiansiming [Thu, 19 Oct 2017 19:20:09 +0000 (19:20 +0000)]
Merge "Fix wrong position of cursor in IccLockSettings"
am:
3a3044eeef
Change-Id: I26f1c35505538768a7816f038c44437fe9a08f67
Treehugger Robot [Thu, 19 Oct 2017 19:14:49 +0000 (19:14 +0000)]
Merge "Fix wrong position of cursor in IccLockSettings"
tiansiming [Mon, 16 Oct 2017 13:32:20 +0000 (21:32 +0800)]
Fix wrong position of cursor in IccLockSettings
Position of cursor goes to the front when submit
an error pin.
Bug:https://issuetracker.google.com/issues/
67839176
Test:
1) Insert a sim card
2) Go to Settings -> Security -> Set up SIM card lock
3) press Lock SIM card checkbox
4) enter 123 and press OK button
Change-Id: I90655f3fa4cb3e4bda251cd0fc62e66300a4b66f
Signed-off-by: tiansiming <tiansiming@xiaomi.com>
Jeff Sharkey [Wed, 18 Oct 2017 22:55:51 +0000 (22:55 +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 am:
a637e31547 -s ours am:
a00521b3a0 am:
16776b64c8
am:
1dcb8522fa
Change-Id: Ife1efc0fe5b721886961327dc72b6fcf2cf1ade9
Jeff Sharkey [Wed, 18 Oct 2017 22:54:01 +0000 (22:54 +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 am:
2a2d92eee8 -s ours am:
a829548c12 am:
3de9e565c8
am:
1e23fc8814
Change-Id: Id4d0641a44fb537a5606e8c118ffdbc93aaf0ae2
Jeff Sharkey [Wed, 18 Oct 2017 22:27:47 +0000 (22: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 am:
07c4c8efed am:
d88820f3f6 am:
629553fb49 am:
397a3555b5 am:
a637e31547 -s ours am:
a00521b3a0 am:
16776b64c8
am:
6b56423651
Change-Id: I18058b80f7f7439f875213d5f6e59b2680cc3dc5
Jeff Sharkey [Wed, 18 Oct 2017 22:26:30 +0000 (22:26 +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 am:
2a2d92eee8 -s ours am:
a829548c12 am:
3de9e565c8
am:
e39f0c21f9
Change-Id: Ib7da524b1e6c64ded9706fedfe487aa99d43e22a
Jeff Sharkey [Wed, 18 Oct 2017 21:52:46 +0000 (21:52 +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 am:
a637e31547 -s ours am:
a00521b3a0
am:
16776b64c8
Change-Id: I96d84487e79ac34428c1b784228745074499cbd9
Jeff Sharkey [Wed, 18 Oct 2017 21:52:01 +0000 (21:52 +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 am:
a637e31547 -s ours am:
a00521b3a0
am:
16776b64c8
Change-Id: I83e412e91bdc14523b26ac11fc0918a21b74a26f
Jeff Sharkey [Wed, 18 Oct 2017 21:51:30 +0000 (21:51 +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 am:
2a2d92eee8 -s ours am:
a829548c12
am:
3de9e565c8
Change-Id: I965ee6c01f5394f390900002295b3d695790d00d
Jeff Sharkey [Wed, 18 Oct 2017 21:50:29 +0000 (21:50 +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 am:
2a2d92eee8 -s ours am:
a829548c12
am:
3de9e565c8
Change-Id: Id3c4eafd2628d04b94e33e057b228ed77c9c32c8
Jeff Sharkey [Wed, 18 Oct 2017 21:32:46 +0000 (21:32 +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 am:
a637e31547 -s ours
am:
a00521b3a0
Change-Id: Idd7111058107886b24ed208ad09d3b13e945de8d
Jeff Sharkey [Wed, 18 Oct 2017 21:31:42 +0000 (21:31 +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 am:
2a2d92eee8 -s ours
am:
a829548c12
Change-Id: Id3b794c734d743757bc5d70f3386fed1c8640c69
Jeff Sharkey [Wed, 18 Oct 2017 21:01:38 +0000 (21:01 +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
am:
a637e31547 -s ours
Change-Id: Ic8c595d0e4847d36ee150763606353225be5a7ff
Jeff Sharkey [Wed, 18 Oct 2017 21:00:49 +0000 (21:00 +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
am:
2a2d92eee8 -s ours
Change-Id: I3ab5a63962eee76a5f199f4be8243829dc943710
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
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
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
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
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
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
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
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
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
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
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
OSDN Git Service
