daqi
35cfba1fa0
Merge "Fix TrustedCredentialsSettings NPE" am: c9e532f508 am: 93860b298b am: 21e55623f2
...
am: b4204836cf
2017-09-08 10:23:05 +00:00
daqi
b4204836cf
Merge "Fix TrustedCredentialsSettings NPE" am: c9e532f508 am: 93860b298b
...
am: 21e55623f2
2017-09-08 10:16:34 +00:00
daqi
21e55623f2
Merge "Fix TrustedCredentialsSettings NPE" am: c9e532f508
...
am: 93860b298b
2017-09-08 10:10:16 +00:00
daqi
93860b298b
Merge "Fix TrustedCredentialsSettings NPE"
...
am: c9e532f508
2017-09-08 10:04:17 +00:00
Treehugger Robot
c9e532f508
Merge "Fix TrustedCredentialsSettings NPE"
2017-09-08 09:56:31 +00:00
Ajay Nadathur
a1c14eaf66
Merge "Set title in remote views if present in bundle" into oc-mr1-dev am: 4ce113d6f8
...
am: 1fe7838e70
2017-09-08 06:59:22 +00:00
Ajay Nadathur
1fe7838e70
Merge "Set title in remote views if present in bundle" into oc-mr1-dev
...
am: 4ce113d6f8
2017-09-08 06:43:46 +00:00
TreeHugger Robot
4ce113d6f8
Merge "Set title in remote views if present in bundle" into oc-mr1-dev
2017-09-08 06:36:46 +00:00
Ajay Nadathur
2e6e4c12a9
Merge "Set title in remote views if present in bundle"
2017-09-08 05:09:21 +00:00
Jack He
9a45bab608
Bluetooth: add metrics for pairing with devices without names am: 5b017f7b05
...
am: d9de1ecc03
2017-09-07 23:54:21 +00:00
Jack He
d9de1ecc03
Bluetooth: add metrics for pairing with devices without names
...
am: 5b017f7b05
2017-09-07 23:25:43 +00:00
TreeHugger Robot
89f57048a0
Merge "Some code cleanup"
2017-09-07 19:55:46 +00:00
Jack He
5b017f7b05
Bluetooth: add metrics for pairing with devices without names
...
* Also caches context in onClick() method
Bug: 34685932
Test: make, unit test
Change-Id: I99beab2c85b8e48c4bc41f69146759d4b7c62428
2017-09-07 12:09:00 -07:00
Daniel Nishi
44da06703e
Merge "Turn in the work profile's badge." into oc-mr1-dev am: 6361c9d851
...
am: 7ee2b191d6
2017-09-07 17:51:54 +00:00
TreeHugger Robot
6f7f25e3fe
Merge "Separate collection of indexable data from indexing"
2017-09-07 17:51:22 +00:00
Fan Zhang
3ed509cb35
Some code cleanup
...
- Formatting
- Remove unused code
Test: robotests
Change-Id: If259c7c3893df96744f3c0ad62a378ef6ce01de7
2017-09-07 10:48:45 -07:00
Daniel Nishi
7ee2b191d6
Merge "Turn in the work profile's badge." into oc-mr1-dev
...
am: 6361c9d851
2017-09-07 17:44:00 +00:00
Matthew Fritze
bdc8fe6da9
Separate collection of indexable data from indexing
...
The first step in refactoring the god class,
DatabaseIndexingManager.
The class has one major entry point: indexDatabase
which begins a chain of calls that first collects all the
data from the fragments, and then massages that data into
the SQLite database. Unfortunately, most of the methods
do not return data, and just pass along some mutated
form of the data until it can be insterted.
Reading and testing this class is very difficult.
This first step moves the collection of the indexable data
into a new class which has a few benefits:
- The data can be easily mocked in tests
- Reduces complexity of D.I.M.
- Separates data collection from indexing, which allows the
indexable data to be piped into a new API that unbundled
search can consume.
Bug:33577327
Test: make RunSettingsRoboTests
Test: Grabbed a DB dump before change, compared to DB dump after change
to make sure everything is still indexed.
Change-Id: Ibc91e3d75ff5dcf5274b93b29bf3544f90b2194d
2017-09-07 08:53:41 -07:00
Daniel Nishi
ab5e8ce249
Merge "Cache storage values for fast loading." into oc-mr1-dev am: 7fae6c67fb
...
am: cad295918c
2017-09-07 15:35:03 +00:00
Daniel Nishi
cad295918c
Merge "Cache storage values for fast loading." into oc-mr1-dev
...
am: 7fae6c67fb
2017-09-07 15:15:16 +00:00
Ajay Nadathur
ab07989b97
Set title in remote views if present in bundle
...
- Title set if defined in the Bundle returned by summaryUri's content
provider.
- summaryUri invoked inline with onBindView call
bug: 62713030
Test: Manually tested, verified that title and summary are retrieved
when settings app is resumed
Change-Id: Id82531eec5ec11ec3492f033fb34ec65a5437a48
2017-09-07 14:56:38 +00:00
daqi
be47df7395
Fix TrustedCredentialsSettings NPE
...
[Cause of Defect]
TrustedCredentialsSettings#mKeyChainConnectionByProfileId is get/set by
more than one thread. Main thread would set it in onDestroy method, and
AsyncTask would get and set in the doInBackground method. So
mKeyChainConnectionByProfileId.get(profileId) would get null after
onDestroy method get called.
Bug: N/A
Test: Debugger to simulate concurrency
Change-Id: I0664d1e9b88b079855354ce0e6fe014a98a22327
Signed-off-by: daqi <daqi@xiaomi.com >
2017-09-07 17:21:25 +08:00
TreeHugger Robot
6361c9d851
Merge "Turn in the work profile's badge." into oc-mr1-dev
2017-09-06 23:20:40 +00:00
Daniel Nishi
7fae6c67fb
Merge "Cache storage values for fast loading." into oc-mr1-dev
2017-09-06 23:07:14 +00:00
Alison Cichowlas
6a8fe253f6
Merge "Reorder "on the lock screen" options." into oc-mr1-dev am: 40b8d3d238
...
am: 22fc09757e
2017-09-06 22:54:54 +00:00
Fan Zhang
6d5a277622
Merge "Misc polishing fixes for Settings" into oc-mr1-dev am: bda6500884
...
am: 08c4871dbe
2017-09-06 22:54:09 +00:00
Fan Zhang
0a07b19dd9
Merge "Pre-set initial state to wifi tether switches." into oc-mr1-dev am: dad9b79630
...
am: b1ff93dfeb
2017-09-06 22:53:14 +00:00
Ajay Nadathur
d1c3084bd5
Set title in remote views if present in bundle
...
- Title set if defined in the Bundle returned by summaryUri's content
provider.
- summaryUri invoked inline with onBindView call
bug: 62713030
Test: Manually tested, verified that title and summary are retrieved
when settings app is resumed
Change-Id: Id82531eec5ec11ec3492f033fb34ec65a5437a48
2017-09-06 15:25:04 -07:00
Alison Cichowlas
22fc09757e
Merge "Reorder "on the lock screen" options." into oc-mr1-dev
...
am: 40b8d3d238
2017-09-06 21:23:52 +00:00
Fan Zhang
08c4871dbe
Merge "Misc polishing fixes for Settings" into oc-mr1-dev
...
am: bda6500884
2017-09-06 21:23:04 +00:00
Fan Zhang
b1ff93dfeb
Merge "Pre-set initial state to wifi tether switches." into oc-mr1-dev
...
am: dad9b79630
2017-09-06 21:22:14 +00:00
TreeHugger Robot
418976552c
Merge "Create owner file for development package"
2017-09-06 21:17:15 +00:00
Alison Cichowlas
40b8d3d238
Merge "Reorder "on the lock screen" options." into oc-mr1-dev
2017-09-06 21:01:35 +00:00
TreeHugger Robot
bda6500884
Merge "Misc polishing fixes for Settings" into oc-mr1-dev
2017-09-06 20:37:15 +00:00
TreeHugger Robot
dad9b79630
Merge "Pre-set initial state to wifi tether switches." into oc-mr1-dev
2017-09-06 19:53:39 +00:00
TreeHugger Robot
7f541b8227
Merge "Clean up test strings"
2017-09-06 19:49:36 +00:00
Bill Yi
ea080fbf34
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 14a359a550 -s ours
...
am: 25012afc7f
2017-09-06 19:19:25 +00:00
Bill Yi
25012afc7f
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 14a359a550
2017-09-06 18:56:13 +00:00
Bill Yi
2b037d3e8a
Import translations. DO NOT MERGE am: 535dd7f066 -s ours am: 363626edcf -s ours
...
am: f8f6cb368d
2017-09-06 18:43:28 +00:00
Julia Reynolds
97942ca832
Merge "Properly show/hide advanced settings" into oc-mr1-dev am: 12c9d6d65a
...
am: fa3fa3483e
2017-09-06 18:42:36 +00:00
TreeHugger Robot
14a359a550
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-09-06 18:40:23 +00:00
Bill Yi
f8f6cb368d
Import translations. DO NOT MERGE am: 535dd7f066 -s ours
...
am: 363626edcf
2017-09-06 18:40:07 +00:00
Julia Reynolds
fa3fa3483e
Merge "Properly show/hide advanced settings" into oc-mr1-dev
...
am: 12c9d6d65a
2017-09-06 18:39:24 +00:00
Bill Yi
5aba524e60
Import translations. DO NOT MERGE am: 535dd7f066 -s ours am: 6171c4a5bb -s ours
...
am: e93c8d88f5
2017-09-06 18:32:05 +00:00
Bill Yi
e93c8d88f5
Import translations. DO NOT MERGE am: 535dd7f066 -s ours
...
am: 6171c4a5bb
2017-09-06 18:29:32 +00:00
Bill Yi
363626edcf
Import translations. DO NOT MERGE
...
am: 535dd7f066
2017-09-06 18:27:10 +00:00
Bill Yi
6171c4a5bb
Import translations. DO NOT MERGE
...
am: 535dd7f066
2017-09-06 18:27:05 +00:00
TreeHugger Robot
12c9d6d65a
Merge "Properly show/hide advanced settings" into oc-mr1-dev
2017-09-06 18:26:13 +00:00
Tony Mak
c04c1baf2e
Merge "Fix policy transparency is missing in remove work profile button" into oc-mr1-dev am: 0280441397
...
am: 799c54830b
2017-09-06 18:24:14 +00:00
Tony Mak
799c54830b
Merge "Fix policy transparency is missing in remove work profile button" into oc-mr1-dev
...
am: 0280441397
2017-09-06 18:12:05 +00:00
