OSDN Git Service
Daniel Finchelstein [Tue, 24 Oct 2017 17:30:35 +0000 (10:30 -0700)]
Rename files for consistency.
Test: CTS (API2 tests)
Change-Id: I8a079525499e564c438281fcf5b3ef8333925f5b
Jeffrey Huang [Tue, 24 Oct 2017 16:52:12 +0000 (16:52 +0000)]
Merge "Reduce padding so that view is no longer hidden"
Rajeev Kumar [Tue, 24 Oct 2017 05:35:35 +0000 (22:35 -0700)]
resolve merge conflicts of
ac0fd76521 to master
Change-Id: I260f92df29e737736e4c0f531656417a202ee607
Test: I solemnly swear I tested this conflict resolution.
Rajeev Kumar [Tue, 24 Oct 2017 05:01:49 +0000 (05:01 +0000)]
Remove SearchIndexProvider from DataPlanUsageSummary fragment.
am:
dd8e66fa20
Change-Id: I0b27a9c68a17f87876d477bad0d10b270aecd550
Rajeev Kumar [Fri, 20 Oct 2017 19:44:17 +0000 (12:44 -0700)]
Remove SearchIndexProvider from DataPlanUsageSummary fragment.
This change will prevent showing Data plan usage in the settings search.
Data plan usage feature has been punted to next release and we do not
want to show this to user in current release.
Bug:
68022715
Test: make RunSettingsRoboTests -j40
Change-Id: I56b71796e3c426122434ca9e86c1a2db691849cf
DO NOT MERGE
Fan Zhang [Tue, 24 Oct 2017 00:29:14 +0000 (00:29 +0000)]
Add strings to support multi-state vivid color management am:
e1543a3895
am:
bb6efe3743
Change-Id: Ie33e65251265406cfb80d4a46e0fff4c6915d161
TreeHugger Robot [Tue, 24 Oct 2017 00:27:55 +0000 (00:27 +0000)]
Merge "Move SimStatus and ImeiInfo Pref Controllers to SettingsLib"
Fan Zhang [Tue, 24 Oct 2017 00:27:02 +0000 (00:27 +0000)]
Add strings to support multi-state vivid color management
am:
e1543a3895
Change-Id: Icc99c1e3348425d70fea3235a4d4c63385c3d38f
Fan Zhang [Mon, 23 Oct 2017 23:30:12 +0000 (16:30 -0700)]
Add strings to support multi-state vivid color management
Bug:
68159303
Test: rebuild
Test: Rerun existing robotests
Change-Id: I893278b7b42df82f58d8c9834e7147692e36670f
TreeHugger Robot [Mon, 23 Oct 2017 23:15:02 +0000 (23:15 +0000)]
Merge "Deprecate Icons from SearchIndexableResources"
Daniel Finchelstein [Mon, 23 Oct 2017 22:54:06 +0000 (22:54 +0000)]
Merge "Revert "Revert "Settings: Enable HAL HDR+ by default"""
Tony Mantler [Fri, 20 Oct 2017 22:03:28 +0000 (15:03 -0700)]
Move SimStatus and ImeiInfo Pref Controllers to SettingsLib
Bug:
67410808
Test: RunSettingsRoboTests
Change-Id: Ib55d2365814b5882f7fcae6bb7f1b62cc3d6ad4e
Fan Zhang [Mon, 23 Oct 2017 21:11:34 +0000 (14:11 -0700)]
Deprecate Icons from SearchIndexableResources
Change-Id: Ic1b9fa1cf5c7ab171b645565a9db5db1993ac85f
Fixes:
38027997
Test: robotests
Doris Ling [Mon, 23 Oct 2017 21:05:45 +0000 (14:05 -0700)]
Set uninstall button to gray color.
For user installed app, set the uninstall button as negative button so
that it will have the correct color.
Change-Id: Ic631386affddf82ae0ebbf29fb572de1f067fc90
Fixes:
68154647
Test: make RunSettingsRoboTests
Chien-Yu Chen [Tue, 10 Oct 2017 18:36:57 +0000 (11:36 -0700)]
Revert "Revert "Settings: Enable HAL HDR+ by default""
This reverts commit
781e762c2c68027c6b4bf8bcb71979c5e8c595c3.
Also updated the V2 version, which was not in the original revert CL.
Test: CTS
Bug:
67590972
Change-Id: I3c1459e432df10d075072e531ef6fc65e3ae4f24
TreeHugger Robot [Sat, 21 Oct 2017 00:07:39 +0000 (00:07 +0000)]
Merge "Set activity title from preference screen title."
TreeHugger Robot [Fri, 20 Oct 2017 23:22:40 +0000 (23:22 +0000)]
Merge "Adding new methods to FakeUid."
TreeHugger Robot [Fri, 20 Oct 2017 23:00:42 +0000 (23:00 +0000)]
Merge "Fix crash from Settings Search"
Doris Ling [Fri, 20 Oct 2017 22:29:56 +0000 (15:29 -0700)]
Set activity title from preference screen title.
- When we initialize the preference screen, if the screen title is
available, use that to set the activity title, so that it will be up to
date with dynamic language changes.
- for preference fragment that don't have preference screen xml, added a
getTitle() method for the fragment to provide the title explicitly.
- use feature flag to switch between the old and new mechanism for
handling activity title.
Bug:
64564191
Test: blaze-bin/screenshots/android/i18nscreenshots/i18nscreenshots
Change-Id: I96318a5aa81e7b8ca94118adac3245ed27a03d93
TreeHugger Robot [Fri, 20 Oct 2017 21:40:47 +0000 (21:40 +0000)]
Merge "Add FingerprintEnroll API"
Jack Yu [Fri, 20 Oct 2017 20:06:05 +0000 (20:06 +0000)]
Merge "Refactored area update info support" am:
60d6ffbc6c am:
3966912efa am:
d4ef8eca27
am:
71beadce17
Change-Id: I8fe1a2170c1e93e898959cbd932596b90ba10bb5
jeffreyhuang [Fri, 20 Oct 2017 20:00:36 +0000 (13:00 -0700)]
Reduce padding so that view is no longer hidden
Change-Id: Iaf9bdea162a8c7422914c141625885873fe1b878
Fixes:
63583041
Test: Manual using settings app
Jack Yu [Fri, 20 Oct 2017 19:52:40 +0000 (19:52 +0000)]
Merge "Refactored area update info support" am:
60d6ffbc6c am:
3966912efa
am:
d4ef8eca27
Change-Id: I969c83a120ab14b5b3aed1c8ef26c9b1970b510d
Jack Yu [Fri, 20 Oct 2017 19:41:05 +0000 (19:41 +0000)]
Merge "Refactored area update info support" am:
60d6ffbc6c
am:
3966912efa
Change-Id: Id337bec84de9d6725974cca94945ba20ebe0e63d
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 17:55:37 +0000 (17:55 +0000)]
Merge "Switch the buttons in bt detail page"
Bill Yi [Fri, 20 Oct 2017 17:45:29 +0000 (17:45 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
a5d652c89f -s ours am:
8313368b32 -s ours
am:
7a20f4a206 -s ours
Change-Id: Iaacf56caee3d21c12d4278b08e543e3a6fb03ead
Bill Yi [Fri, 20 Oct 2017 17:15:14 +0000 (17:15 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
a5d652c89f -s ours
am:
8313368b32 -s ours
Change-Id: Id8ca07902a1ec999a3924f4f77d1318da68a6cef
TreeHugger Robot [Fri, 20 Oct 2017 16:55:37 +0000 (16:55 +0000)]
Merge "Catch exception when checking WifiDisplay availability"
Bill Yi [Fri, 20 Oct 2017 16:47:03 +0000 (16:47 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
a5d652c89f -s ours
Change-Id: I10da6389cb21f6c4ddcc4b6047feed58c48bd665
Jeffrey Huang [Fri, 20 Oct 2017 16:45:51 +0000 (16:45 +0000)]
Merge changes Icddb9d35,I36f76f93,Ie7b6afa5
* changes:
Add existing controllers in about phone to v2 fork
Create XML layout for about phone v2
Fork a new about phone layout
Ben Schwartz [Fri, 20 Oct 2017 15:46:01 +0000 (15:46 +0000)]
Merge "Add a developer option for controlling DNS over TLS" am:
c8207de343 am:
ed97eaeb4a am:
1fd46833ef
am:
2372074d57
Change-Id: I0ae492cccd6c7031abab23cc77310e09c04a6872
Ben Schwartz [Fri, 20 Oct 2017 15:33:50 +0000 (15:33 +0000)]
Merge "Add a developer option for controlling DNS over TLS" am:
c8207de343 am:
ed97eaeb4a
am:
1fd46833ef
Change-Id: I30f6c28acc3825ff51190d1d54494cac5d774497
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:15:14 +0000 (15:15 +0000)]
Merge "Add a developer option for controlling DNS over TLS" am:
c8207de343
am:
ed97eaeb4a
Change-Id: Iafc1e11d79f163d57e1d5e8bb3524c3d44f1b240
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)
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
jackqdyulei [Thu, 19 Oct 2017 23:34:33 +0000 (16:34 -0700)]
Switch the buttons in bt detail page
The forget button should be left and connect button be right.
Bug:
67915643
Test: RunSettingsRoboTests
Change-Id: I71bb99270c4a3d480346db1ded554ecc9b99e706
TreeHugger Robot [Thu, 19 Oct 2017 23:18:17 +0000 (23:18 +0000)]
Merge "Misc logging improvements"
jeffreyhuang [Thu, 19 Oct 2017 21:46:32 +0000 (14:46 -0700)]
Add existing controllers in about phone to v2 fork
- Added build number controller
- Added safety info controller
- Added regulatory info controller
Bug:
36458278
Test: make RunSettingsRoboTests -j40
Change-Id: Icddb9d352b4f739ca1c7cf562dec09530cb41dac
jeffreyhuang [Thu, 19 Oct 2017 21:29:28 +0000 (14:29 -0700)]
Create XML layout for about phone v2
- Added all the necessary preferences in the xml layout
Bug:
36458278
Test: make RunSettingsRoboTests -j40
Change-Id: I36f76f9360b809eba077497db68d012098820868
TreeHugger Robot [Thu, 19 Oct 2017 21:47:21 +0000 (21:47 +0000)]
Merge "Fingerprint enrolling should update UI while in multi-window mode"
jeffreyhuang [Thu, 19 Oct 2017 20:36:40 +0000 (13:36 -0700)]
Fork a new about phone layout
- Used a feature flag to hide the new about phone page
Bug:
36458278
Test: make RunSettingsRoboTests -j40
Change-Id: Ie7b6afa58b301128d1c60513ae4ee48d6ec6679b
tiansiming [Thu, 19 Oct 2017 19:29:11 +0000 (19:29 +0000)]
Merge "Fix wrong position of cursor in IccLockSettings" am:
3a3044eeef am:
92e77cbd43 am:
ecf2bdb46f
am:
cca755cfac
Change-Id: Ibe3700977ed96afe09e0b15ceecf125edeb6d23b
tiansiming [Thu, 19 Oct 2017 19:24:53 +0000 (19:24 +0000)]
Merge "Fix wrong position of cursor in IccLockSettings" am:
3a3044eeef am:
92e77cbd43
am:
ecf2bdb46f
Change-Id: I643bffc3f0eaf326b79dd7cebce2fff287396e1e
tiansiming [Thu, 19 Oct 2017 19:22:16 +0000 (19:22 +0000)]
Merge "Fix wrong position of cursor in IccLockSettings" am:
3a3044eeef
am:
92e77cbd43
Change-Id: Icfa12295c4111766f4c189443b9a6997a1cc0031
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"
Kevin Chyn [Fri, 13 Oct 2017 23:34:05 +0000 (16:34 -0700)]
Add FingerprintEnroll API
Fixes:
65459785
Test: adb shell am start -a android.settings.FINGERPRINT_ENROLL
Flow is correct with and without PIN/Pattern/Pass set up
Test: make -j56 SettingsUnitTests
adb install -r out/target/product/walleye/data/app/SettingsUnitTests/SettingsUnitTests.apk
adb shell am instrument -w -e class com.android.settings.fingerprint.FingerprintEnrollIntroductionTest 'com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner'
Change-Id: If987257943190eb91d5822e683657aea621d2206
Matthew Fritze [Thu, 19 Oct 2017 17:38:08 +0000 (10:38 -0700)]
Fix crash from Settings Search
Security Settings was returning a search indexable
resource without an xml resource (in this case id = 0).
Settings search did not handle this exception and crashed.
This patch catches the exception, and adds a TODO to fix
the indexing in security settings.
Change-Id: Ic7f05c98d99cc45fbebbdc672c7e346c27daa0f0
Fixes:
67967367
Test: robotests
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>
Bill Yi [Thu, 19 Oct 2017 01:17:06 +0000 (18:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I077bf16890d37404acb52c6ee1fdf584a978e094
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
TreeHugger Robot [Wed, 18 Oct 2017 23:35:13 +0000 (23:35 +0000)]
Merge "Cleanup Controllers/Fragments"
TreeHugger Robot [Wed, 18 Oct 2017 23:27:38 +0000 (23:27 +0000)]
Merge "Convert more loadIcon() to IconDrawableFactory"
TreeHugger Robot [Wed, 18 Oct 2017 23:10:12 +0000 (23:10 +0000)]
Merge "Use correct flags on ACTION_TIME_CHANGED broadcast"
Jeff Sharkey [Wed, 18 Oct 2017 23:00:49 +0000 (23:00 +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
am:
937ede14d8 -s ours
Change-Id: I8c23627db5650e7547b79a38d91754aa7cd67418
Jeff Sharkey [Wed, 18 Oct 2017 23:00:17 +0000 (23: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 am:
a829548c12 am:
3de9e565c8 am:
1e23fc8814
am:
9220dda5b8 -s ours
Change-Id: I96930790d6006cb843667edb70fd1fe051f05649
Jeff Sharkey [Wed, 18 Oct 2017 22:59:45 +0000 (22:59 +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
am:
0f1d957bb3 -s ours
Change-Id: Ia5e090ac74029698f5d8c48712cbed64605ae977
Jeff Sharkey [Wed, 18 Oct 2017 22:58:42 +0000 (22:58 +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
am:
b5f7753e18 -s ours
Change-Id: Icbc6d2a281b151fdcc60772cb3978c8592a685d7
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
Fan Zhang [Wed, 18 Oct 2017 22:27:13 +0000 (15:27 -0700)]
Misc logging improvements
- Log ACTION_SEARCH_RESULTS whenever a search query is performed.
eg, type "qu" will result 2 such logging events.
- Remove historam logging to search result click count (already logged
as ACTION_CLICK_SETTINGS_SEARCH_RESULT)
Change-Id: Ia207b34702e0f24a7885e47d093f6cce1314ebc4
Fixes:
67743512
Fixes:
64939544
Test: robotests
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
jeffreyhuang [Wed, 18 Oct 2017 22:03:41 +0000 (15:03 -0700)]
Cleanup Controllers/Fragments
- Removed extra comments in DevelopmentSettingsDashboardFragment
- Removed unused methods from controllers
- Clean up method names
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: Ibe7a0921926d4529f62a212b55c8fa2f14ecb18b
Fan Zhang [Wed, 18 Oct 2017 00:04:04 +0000 (17:04 -0700)]
Convert more loadIcon() to IconDrawableFactory
- AppGridView: used by preview chart in display size setting.
- DefaultBrowserPreferenceController: default browser icon in default
apps settings
- Enterprise application list
- Accessibility search result loader
Change-Id: Ibd12cd8854c68760ea3428fffa735bcbba48a277
Fixes:
64336923
Test: robotests
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
Kweku Adams [Wed, 18 Oct 2017 20:56:04 +0000 (13:56 -0700)]
Adding new methods to FakeUid.
Test: built and flashed to device
Bug:
65750808
Change-Id: Iddc198ce5b971105a44d15b8490138c18fc0f065
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
TreeHugger Robot [Wed, 18 Oct 2017 20:27:45 +0000 (20:27 +0000)]
Merge "Fix a monkey crash: guard against position -1."
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
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
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
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
Fan Zhang [Wed, 18 Oct 2017 18:47:01 +0000 (11:47 -0700)]
Fix a monkey crash: guard against position -1.
When handling onClick in ManageApplications, skip getAppEntry if
position is -1.
Change-Id: I565c42b2c9f742445e49fd4c2e7db539d0f6f8ad
Fixes:
67940121
Test: manual
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
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
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
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
TreeHugger Robot [Wed, 18 Oct 2017 17:47:33 +0000 (17:47 +0000)]
Merge "Use IconDrawableFactory to load icons for default apps."
OSDN Git Service
