Xiyuan Xia
a104c05da9
Merge "Fix wrong stage exception in ChooseLockPattern" into mnc-dr-dev
2015-09-01 18:46:19 +00:00
Xiyuan Xia
e47a2ab83e
Fix wrong stage exception in ChooseLockPattern
...
ChooseLockPattern should updateStage instead of always enabling
pattern view input.
Bug:22760251
Change-Id: I3675c0aada293e168769147ba8e4203e9310e593
2015-09-01 11:29:36 -07:00
Jason Monk
359170f4b0
Protect against multiple provision responses
...
Bug: 23573004
Change-Id: I9cbc7574d2019244f7198784372ce68d7e4d1fa2
2015-09-01 13:20:55 -04:00
Xiyuan Xia
00b17fa3c3
Fix races in ConfirmPassword/Pattern
...
- Add a CheckLockResultTracker to track result of async lock check so that
it can finish on configuration change;
- Let the pending lock check finish and ignore subsequent check requests;
- Add a mDisappearing flag to prevent running disappear animation
multiple times;
- Check whether activity is still active after disappear animation
before setting result and finishing it;
- Remove no longer used mNumWrongConfirmAttempts;
Bug:23190499
Change-Id: If1784d3d1fcc152ac06137b12748b9def5726692
2015-08-31 15:25:31 -07:00
Fyodor Kupolov
20f6f0d31f
Merge "Use createRestrictedProfile method to create profile"
2015-08-29 00:08:20 +00:00
Fyodor Kupolov
9938f6fa45
Use createRestrictedProfile method to create profile
...
Bug: 23191995
Change-Id: I83d900b274563dc964fd07dbd0fccbdb4b275f29
2015-08-28 17:02:21 -07:00
Maurice Lam
566af8ce2a
am 2fef0595
: am 07c2561d
: am 8cea65f9
: am 3087a4e0
: Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-dev
...
* commit '2fef059543bc859d5723246a635d0e1773f623de':
[Fingerprint] Add skip dialog during SUW
2015-08-28 22:48:17 +00:00
Maurice Lam
2fef059543
am 07c2561d
: am 8cea65f9
: am 3087a4e0
: Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-dev
...
* commit '07c2561d80fba5b3764177aa03dc4496cbe9b47e':
[Fingerprint] Add skip dialog during SUW
2015-08-28 22:41:42 +00:00
Maurice Lam
8cea65f99f
am 3087a4e0
: Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-dev
...
* commit '3087a4e0fd792531e567c7b508dd1e65b7fcf515':
[Fingerprint] Add skip dialog during SUW
2015-08-28 22:24:52 +00:00
Maurice Lam
3087a4e0fd
Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-dev
2015-08-28 22:13:19 +00:00
Xiaohui Chen
47a82b5d6d
Merge "Cleanup USER_OWNER for cryptkeeper"
2015-08-28 20:35:24 +00:00
Maurice Lam
48cf33a94e
[Fingerprint] Add skip dialog during SUW
...
During setup wizard, add a skip dialog to confirm whether the user
wants to skip fingerprint setup or not.
Bug: 23228889
Change-Id: I2c1c26522b085e722e7bd7b34a26d2a38412bee4
2015-08-28 12:39:21 -07:00
Xiyuan Xia
f8c1636807
am 12ec7efe
: am e053491b
: am e927bd70
: am 43fe6dba
: Merge "Fix ChoosePat/Pin/Pwd crash from async task" into mnc-dr-dev
...
* commit '12ec7efeb3efcaba014f9c23f0e1505d218996d4':
Fix ChoosePat/Pin/Pwd crash from async task
2015-08-28 02:09:11 +00:00
Xiyuan Xia
12ec7efeb3
am e053491b
: am e927bd70
: am 43fe6dba
: Merge "Fix ChoosePat/Pin/Pwd crash from async task" into mnc-dr-dev
...
* commit 'e053491bcc55ce844cd1f38dc61dac7edc15750a':
Fix ChoosePat/Pin/Pwd crash from async task
2015-08-28 02:04:41 +00:00
Xiyuan Xia
e927bd7014
am 43fe6dba
: Merge "Fix ChoosePat/Pin/Pwd crash from async task" into mnc-dr-dev
...
* commit '43fe6dba693f8f23ffd69c1ffcd3b5642266be58':
Fix ChoosePat/Pin/Pwd crash from async task
2015-08-28 01:52:26 +00:00
Xiyuan Xia
43fe6dba69
Merge "Fix ChoosePat/Pin/Pwd crash from async task" into mnc-dr-dev
2015-08-28 01:46:57 +00:00
Xiaohui Chen
b7c8fbf402
Cleanup USER_OWNER for cryptkeeper
...
Bug: 19913735
Change-Id: If8df927e72321e00bfef49a6c81953442e04969d
2015-08-27 15:46:32 -07:00
Xiyuan Xia
3e7e3d6c59
Fix ChoosePat/Pin/Pwd crash from async task
...
Use a retained worker fragment to track the asynchronous
save-and-finish task so that ChoosePattern/Password activity
is properly dismissed after a configuration change.
Bug:23424884
Bug:23521530
Change-Id: I328022c1603cfb0f6812cd8aa7916ae7b72c9950
2015-08-27 13:35:55 -07:00
Julia Reynolds
8d731a62d4
Merge "Use common extra names when launching external config."
2015-08-26 18:47:08 +00:00
Robin Lee
baefdcf9eb
Show installed user keys in Security Settings
...
This makes removing a particular keyset possible without deleting the
whole keystore along with it.
Bug: 22541933
Change-Id: I248803cb27efdd1695438dfc82951887dc579f99
2015-08-26 16:22:19 +01:00
Yasuhiro Matsuda
a5c73b423d
Merge "Handle the case where null is returned for USB_STATE intent."
2015-08-26 09:36:41 +00:00
Yasuhiro Matsuda
ea37281d9e
Merge "Handle the case where USB_STATE intent is not received yet."
2015-08-26 09:36:41 +00:00
Lifu Tang
b3e11be230
Created new task when launching injected activity
...
Bug: 22320782
Change-Id: I6cf1e4976a097c4c40afcc4c73f7f9904e9e7aac
2015-08-25 18:45:52 -07:00
Jim Miller
8b8ac00d84
am e3f8ef83
: am d63408d9
: am d7e4cd9b
: am f7fc6429
: Merge "Don\'t attempt to remove fp templates if none are enrolled" into mnc-dr-dev
...
* commit 'e3f8ef8333fbf916d608d950b594135b760bbda5':
Don't attempt to remove fp templates if none are enrolled
2015-08-25 23:37:53 +00:00
Jim Miller
e3f8ef8333
am d63408d9
: am d7e4cd9b
: am f7fc6429
: Merge "Don\'t attempt to remove fp templates if none are enrolled" into mnc-dr-dev
...
* commit 'd63408d91576277acec9c2169e48eff839516470':
Don't attempt to remove fp templates if none are enrolled
2015-08-25 23:33:55 +00:00
Jim Miller
d7e4cd9b1e
am f7fc6429
: Merge "Don\'t attempt to remove fp templates if none are enrolled" into mnc-dr-dev
...
* commit 'f7fc6429874fd02bc3670bce98b2158d2a78aecd':
Don't attempt to remove fp templates if none are enrolled
2015-08-25 23:18:54 +00:00
Jim Miller
f7fc642987
Merge "Don't attempt to remove fp templates if none are enrolled" into mnc-dr-dev
2015-08-25 23:08:55 +00:00
Julia Reynolds
3692a5abe1
Use common extra names when launching external config.
...
Bug: 22977552
Change-Id: Ib91bcea76598cb5e712ad0c1f0a5cd1f9dc16fbe
2015-08-25 14:55:54 -04:00
Wei Liu
9dde0669f2
am 656c805b
: am 70238114
: am 6e58d516
: Refactor UidDetailProvider and its dependencies to SettingsLib.
...
* commit '656c805bf38dd299ae25fbe39806650122aa6314':
Refactor UidDetailProvider and its dependencies to SettingsLib.
2015-08-25 18:45:34 +00:00
Wei Liu
656c805bf3
am 70238114
: am 6e58d516
: Refactor UidDetailProvider and its dependencies to SettingsLib.
...
* commit '702381144781d68551e765dcf8b23cf3dbca3ce5':
Refactor UidDetailProvider and its dependencies to SettingsLib.
2015-08-25 18:37:40 +00:00
Wei Liu
f280a5ec5a
am dd65a1d9
: am ad50b81f
: am 0e309b86
: Merge "Move SummaryForAllUidLoader to SettingsLib." into cw-e-dev
...
* commit 'dd65a1d98d46716069b6c2a58c2c268afbeb8ba6':
Move SummaryForAllUidLoader to SettingsLib.
2015-08-25 18:18:38 +00:00
Wei Liu
dd65a1d98d
am ad50b81f
: am 0e309b86
: Merge "Move SummaryForAllUidLoader to SettingsLib." into cw-e-dev
...
* commit 'ad50b81f492fb01390679f697d1f340da35ef28c':
Move SummaryForAllUidLoader to SettingsLib.
2015-08-25 18:11:06 +00:00
Wei Liu
6e58d516f0
Refactor UidDetailProvider and its dependencies to SettingsLib.
...
so that it can be reused by Wear app data usage.
Change-Id: Id05f888274e15fbeffa175ee8073de02a8966867
2015-08-25 11:02:59 -07:00
Wei Liu
0e309b867d
Merge "Move SummaryForAllUidLoader to SettingsLib." into cw-e-dev
2015-08-25 17:55:31 +00:00
Sanket Padawe
fea726a1be
am 481df58d
: am 226dec50
: am 8b58dc57
: am 1a9626f0
: am 3be6d0b4
: Merge "Avoid new network to connect by using "Add Network" instead only Save it." into mnc-dev
...
* commit '481df58d49cb37080899ecfe21a22c13943701b2':
Avoid new network to connect by using "Add Network" instead only Save it.
2015-08-24 23:38:53 +00:00
Wei Liu
8dffd150c4
Move SummaryForAllUidLoader to SettingsLib.
...
In order to show the data usage per app on Android Wear,
I'm moving SummaryForAllUidLoader to SettingsLib so that
the code can be reused.
Change-Id: I1833492d4a3b513405bfc1069b8656d04dd37c48
2015-08-24 11:47:27 -07:00
Sanket Padawe
481df58d49
am 226dec50
: am 8b58dc57
: am 1a9626f0
: am 3be6d0b4
: Merge "Avoid new network to connect by using "Add Network" instead only Save it." into mnc-dev
...
* commit '226dec509dd03638dbb489a75f35ec49d2fe4dca':
Avoid new network to connect by using "Add Network" instead only Save it.
2015-08-24 18:21:51 +00:00
Sanket Padawe
8b58dc577c
am 1a9626f0
: am 3be6d0b4
: Merge "Avoid new network to connect by using "Add Network" instead only Save it." into mnc-dev
...
* commit '1a9626f056d253aa25fca561010624c463bbf9a9':
Avoid new network to connect by using "Add Network" instead only Save it.
2015-08-24 18:05:59 +00:00
Sanket Padawe
1a9626f056
am 3be6d0b4
: Merge "Avoid new network to connect by using "Add Network" instead only Save it." into mnc-dev
...
* commit '3be6d0b44bf1152be0bc11bf6bacf750e1028b49':
Avoid new network to connect by using "Add Network" instead only Save it.
2015-08-24 17:59:07 +00:00
Sanket Padawe
3be6d0b44b
Merge "Avoid new network to connect by using "Add Network" instead only Save it." into mnc-dev
2015-08-24 17:52:51 +00:00
Christopher Tate
51b3b8a20e
am 435d6f2e
: am b20e1b6c
: am c9d5bfcb
: am 5d187aa4
: am ffe701dc
: Present the security patch date in a human-friendly format
...
* commit '435d6f2ea0572a90c90096a71529a02b2e2c9aaa':
Present the security patch date in a human-friendly format
2015-08-22 01:38:14 +00:00
Jim Miller
c2f6813a83
Don't attempt to remove fp templates if none are enrolled
...
The code was blindly calling fpm.remove(0) to remove all
fingerprint templates and then waiting for them to be removed.
Fixes bug 23183484
Change-Id: Ie510097d85bba32d965ba3c7f324f6c042e08300
2015-08-21 18:07:50 -07:00
Christopher Tate
435d6f2ea0
am b20e1b6c
: am c9d5bfcb
: am 5d187aa4
: am ffe701dc
: Present the security patch date in a human-friendly format
...
* commit 'b20e1b6cca89eff91bc63b8918e8f75d450a5854':
Present the security patch date in a human-friendly format
2015-08-22 00:41:22 +00:00
Christopher Tate
c9d5bfcb96
am 5d187aa4
: am ffe701dc
: Present the security patch date in a human-friendly format
...
* commit '5d187aa43d262582241cd3a7097fc2fda0c875e6':
Present the security patch date in a human-friendly format
2015-08-22 00:16:24 +00:00
Sanket Padawe
e0ece963c6
Avoid new network to connect by using "Add Network" instead only Save it.
...
Bug: 23422433
Change-Id: I49aabff91ba127bf2a3b0aa25c8163ee4097bf4d
2015-08-21 16:45:30 -07:00
Christopher Tate
5d187aa43d
am ffe701dc
: Present the security patch date in a human-friendly format
...
* commit 'ffe701dc0e52ee95bf6c54291ed1b574d389019c':
Present the security patch date in a human-friendly format
2015-08-21 19:26:07 +00:00
Christopher Tate
ffe701dc0e
Present the security patch date in a human-friendly format
...
For example, for an ISO date of 2015-08-01, this now displays
"August 1, 2015" in enUS, and "1 August 2015" in enUK, and
"2015年8月1日" in jpJP.
Bug 23358065
Change-Id: Iaa920ec88d765a222f0b589123665b689bf41978
2015-08-20 17:16:08 -07:00
Jason Monk
5711e73146
Possibly fix apps loading forever
...
- Consistently handle results from filters whether async or not
- Make sure we trigger a rebuild after loading entries is complete
Bug: 22838302
Change-Id: I4595c61d4ea7069e59440c9dc673a1f0b73bc864
2015-08-20 18:13:52 +00:00
Julia Reynolds
975645c0ca
Reduce jank on 'touch sounds' switch.
...
Bug: 23360053
Change-Id: Iec47e1464cfa0bd53f40977f7fa58c37dd635853
2015-08-20 10:42:14 -04:00
Julia Reynolds
0a1b513f70
Merge "Fix settings crash during factory reset."
2015-08-19 20:40:35 +00:00