Commit Graph

22210 Commits

Author SHA1 Message Date
Sungmin Choi
9fcc7e1b20 Hide or show APNs with type="ims" as CarrierConfig
APN with type="ims" is used to attach IMS APN to the modem.
This APN is meaningless and confusing to end users.
Most carriers don't care to show this APN from apn list.
Some carriers want to show this APN from apn list and others don't.
This change hides or shows this as CarrierConfig from the APN list.

Bug: 23770219
Change-Id: Ia632f39401d84e8c63ac96f1c3b12aa3d8d2a4e6
2015-09-08 17:23:14 -07:00
Jorim Jaggi
c0c0bf3009 am 5cca5a5a: am b83cbe20: Fix build
* commit '5cca5a5a2c54e3ca64df5a2dc7c7bdf4cecf6507':
  Fix build
2015-09-08 22:02:24 +00:00
Jorim Jaggi
5cca5a5a2c am b83cbe20: Fix build
* commit 'b83cbe202bd56cf542d898837474757dca3625f2':
  Fix build
2015-09-08 21:53:45 +00:00
Jorim Jaggi
b83cbe202b Fix build
Change-Id: I8885ecd0f5ccab5e73f75323c51a504509c575e3
2015-09-08 21:42:17 +00:00
Jorim Jaggi
52aca96c0b am 64ea62a3: am 8c543276: Fix crash in fingerprint settings when rotating
* commit '64ea62a30a416b46ecdb2042e052825b96702012':
  Fix crash in fingerprint settings when rotating
2015-09-08 21:26:38 +00:00
Jorim Jaggi
64ea62a30a am 8c543276: Fix crash in fingerprint settings when rotating
* commit '8c543276f1dd366bd142ce44a8e3084fddb22971':
  Fix crash in fingerprint settings when rotating
2015-09-08 21:17:06 +00:00
Jorim Jaggi
8c543276f1 Fix crash in fingerprint settings when rotating
Fragments always need empty constructors.

Bug: 23806551
Change-Id: Ib22a89be60f799d70caf1acf2ac95a20e6be9675
2015-09-08 20:43:16 +00:00
Geoff Mendal
593714a8d1 am f1e6378a: (-s ours) am f1a62026: (-s ours) Import translations. DO NOT MERGE
* commit 'f1e6378a7e181fadd0ccd007dc7249d7ad250a24':
  Import translations. DO NOT MERGE
2015-09-07 15:51:05 +00:00
Geoff Mendal
f1e6378a7e am f1a62026: (-s ours) Import translations. DO NOT MERGE
* commit 'f1a62026b83b54b5f234cd87df66fa32f754c914':
  Import translations. DO NOT MERGE
2015-09-07 15:42:38 +00:00
Geoff Mendal
f1a62026b8 Import translations. DO NOT MERGE
Change-Id: Id6db6ab56902ac4bc1775dc6fdcac0e487329660
Auto-generated-cl: translation import
2015-09-07 08:35:11 -07:00
Adam Lesinski
2350b8445c Update implementation to match BatteryStats.Uid
Change-Id: Ibdb7dc4b98c5a365c97bb56ad51e936b51892d3f
2015-09-06 01:57:58 -07:00
Jason Monk
3f2ac58c93 am 07b26bb3: am 1cfaf01f: Merge "Start tether service with redeliver intent" into mnc-dr-dev
* commit '07b26bb3fcc35d990be7263afe546445d23938b2':
  Start tether service with redeliver intent
2015-09-03 18:25:57 +00:00
Jason Monk
07b26bb3fc am 1cfaf01f: Merge "Start tether service with redeliver intent" into mnc-dr-dev
* commit '1cfaf01fdaba22884a126a84748cf3a619785b3e':
  Start tether service with redeliver intent
2015-09-03 18:14:51 +00:00
Jason Monk
1cfaf01fda Merge "Start tether service with redeliver intent" into mnc-dr-dev 2015-09-03 17:51:09 +00:00
Jason Monk
09ea9724fa Start tether service with redeliver intent
So that the intent comes back when we are restarted rather than
null causing a crash.

Bug: 23678853
Change-Id: I1697159d5557feb7a87b238f8efa99ed3142fe6a
2015-09-03 12:50:01 -04:00
Jorim Jaggi
bfacb5f483 am 98d91550: am c624a72b: Merge "Fix fingerprint settings ripples" into mnc-dr-dev
* commit '98d91550b624ca942fea7d096835c5bdf73f9af2':
  Fix fingerprint settings ripples
2015-09-03 01:37:47 +00:00
Jorim Jaggi
98d91550b6 am c624a72b: Merge "Fix fingerprint settings ripples" into mnc-dr-dev
* commit 'c624a72be19027a0784fb41575129b334ff02ae7':
  Fix fingerprint settings ripples
2015-09-03 01:28:51 +00:00
Jorim Jaggi
c624a72be1 Merge "Fix fingerprint settings ripples" into mnc-dr-dev 2015-09-03 01:19:28 +00:00
Jorim Jaggi
1e2433693a Fix fingerprint settings ripples
Bug: 22471044
Bug: 23234027
Change-Id: If74a133f33c9cc72cb9ff6ccce32458d7300ae07
2015-09-02 17:42:29 -07:00
Maurice Lam
84afdfdefa am 82db64e9: am d8723073: Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev
* commit '82db64e940905a18aae4e716f361b6a9a72d0a4e':
  [Fingerprint] Update strings for skip dialog
2015-09-02 23:54:52 +00:00
Maurice Lam
82db64e940 am d8723073: Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev
* commit 'd8723073bb802c0e75df20edbada5e47bd020057':
  [Fingerprint] Update strings for skip dialog
2015-09-02 23:44:06 +00:00
Maurice Lam
d8723073bb Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev 2015-09-02 23:35:15 +00:00
Maurice Lam
df65e153e6 [Fingerprint] Update strings for skip dialog
Bug: 23228889
Change-Id: I6c85dccbda2b5c0ad44ac72ca4107f9dcbb6a1b5
2015-09-02 14:36:19 -07:00
Sungmin Choi
a43a40ffe7 am e31208ae: am 05c7dde1: To hide none security option, use config_hide_none_security_option config
* commit 'e31208ae1c253b35edd34192f49c14a59bbd8c13':
  To hide none security option, use config_hide_none_security_option config
2015-09-02 21:25:25 +00:00
Sungmin Choi
e31208ae1c am 05c7dde1: To hide none security option, use config_hide_none_security_option config
* commit '05c7dde1f3a6044db7b687dfcbacbde50f3befb1':
  To hide none security option, use config_hide_none_security_option config
2015-09-02 21:02:58 +00:00
Sungmin Choi
05c7dde1f3 To hide none security option, use config_hide_none_security_option config
Use mcc config overlay mechanism to hide none security option
in countries where it is mandatory.
To hide none security option, set config_hide_none_security_option config
true as mcc config overlay.

Bug: 22209425
Bug: 22975388
Change-Id: I774c53e17d3b50393816622134e58f8e06b76fab
2015-09-02 13:51:44 -07:00
Geoff Mendal
532ebb9f7a am 8ee8b379: (-s ours) am e182fa77: (-s ours) Import translations. DO NOT MERGE
* commit '8ee8b37933b52d8f495cb9317b02f4843aa090bb':
  Import translations. DO NOT MERGE
2015-09-02 14:28:48 +00:00
Geoff Mendal
8ee8b37933 am e182fa77: (-s ours) Import translations. DO NOT MERGE
* commit 'e182fa77888d0b42b4896f031e7b1d8c88a62a4c':
  Import translations. DO NOT MERGE
2015-09-02 14:18:54 +00:00
Geoff Mendal
e182fa7788 Import translations. DO NOT MERGE
Change-Id: I9f2e39d6875f3f3d6b4eab8c3c29a0155c69d6ce
Auto-generated-cl: translation import
2015-09-02 07:05:31 -07:00
Xiyuan Xia
beebc95884 am 676a4b65: am 50e1f59a: Merge "Fix races in ConfirmPassword/Pattern" into mnc-dr-dev
* commit '676a4b65b18a97851c6762446b8236ca941cd0a3':
  Fix races in ConfirmPassword/Pattern
2015-09-01 20:53:56 +00:00
Xiyuan Xia
676a4b65b1 am 50e1f59a: Merge "Fix races in ConfirmPassword/Pattern" into mnc-dr-dev
* commit '50e1f59a6891cbf3995db0e7fc811f018f9ba63a':
  Fix races in ConfirmPassword/Pattern
2015-09-01 20:39:58 +00:00
Xiyuan Xia
50e1f59a68 Merge "Fix races in ConfirmPassword/Pattern" into mnc-dr-dev 2015-09-01 20:29:41 +00:00
Jason Monk
2ffca0c52a am b39ceab7: am 65b0666d: Merge "Protect against multiple provision responses" into mnc-dr-dev
* commit 'b39ceab718f0265be3c7e8bf9df1ab0917b5307b':
  Protect against multiple provision responses
2015-09-01 19:21:03 +00:00
Jason Monk
b39ceab718 am 65b0666d: Merge "Protect against multiple provision responses" into mnc-dr-dev
* commit '65b0666d36896c0c5616f867af5396c036ed1cb6':
  Protect against multiple provision responses
2015-09-01 19:10:12 +00:00
Xiyuan Xia
060ce6b5a7 am 9e06cbf5: am a104c05d: Merge "Fix wrong stage exception in ChooseLockPattern" into mnc-dr-dev
* commit '9e06cbf5a379d0a05f13d2a6e1660793fb7015a3':
  Fix wrong stage exception in ChooseLockPattern
2015-09-01 19:07:30 +00:00
Jason Monk
65b0666d36 Merge "Protect against multiple provision responses" into mnc-dr-dev 2015-09-01 19:02:44 +00:00
Xiyuan Xia
9e06cbf5a3 am a104c05d: Merge "Fix wrong stage exception in ChooseLockPattern" into mnc-dr-dev
* commit 'a104c05da9d42375f7307cce58039f7edafaa078':
  Fix wrong stage exception in ChooseLockPattern
2015-09-01 18:54:08 +00:00
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
Geoff Mendal
9cc1143d8f am 0e6d3846: (-s ours) am f33098ea: (-s ours) Import translations. DO NOT MERGE
* commit '0e6d38462b96c61465d06ce6c5dfa17297e49df8':
  Import translations. DO NOT MERGE
2015-08-31 14:25:26 +00:00
Geoff Mendal
0e6d38462b am f33098ea: (-s ours) Import translations. DO NOT MERGE
* commit 'f33098eaa02416997775fe1112484c56b13dc93b':
  Import translations. DO NOT MERGE
2015-08-31 14:18:22 +00:00
Geoff Mendal
f33098eaa0 Import translations. DO NOT MERGE
Change-Id: Id58b50a01ad4217ad851dd8aed6a53b39ce3d426
Auto-generated-cl: translation import
2015-08-31 07:07:58 -07:00
Geoff Mendal
f7a20d5349 am e387dccb: (-s ours) am 96edf807: (-s ours) Import translations. DO NOT MERGE
* commit 'e387dccbacb9119fec02a54d26440ef5a2ee0ce1':
  Import translations. DO NOT MERGE
2015-08-29 22:57:36 +00:00
Geoff Mendal
e387dccbac am 96edf807: (-s ours) Import translations. DO NOT MERGE
* commit '96edf8077347297d030af02a9452c726bbc421c8':
  Import translations. DO NOT MERGE
2015-08-29 22:44:43 +00:00
Geoff Mendal
96edf80773 Import translations. DO NOT MERGE
Change-Id: Idee4ab4cd6915f02efac37f747640077a33cb75a
Auto-generated-cl: translation import
2015-08-29 08:38:50 -07:00
Maurice Lam
07c2561d80 am 8cea65f9: am 3087a4e0: Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-dev
* commit '8cea65f99f23c1a86d7a760b2dba89fa83036959':
  [Fingerprint] Add skip dialog during SUW
2015-08-28 22:31:35 +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