Fyodor Kupolov
e84a5eac2c
Merge "Remove the check hasMultipleUsers in Settings."
2015-05-19 17:50:01 +00:00
Nicolas Prevot
ea5677e1a3
Remove the check hasMultipleUsers in Settings.
...
When deciding to show the user section or not, Just rely
on supportsMultipleUsers. Don't check hasMultipleUsers.
BUG:21119929
Change-Id: Ifbddac10e2f6dc02b8e2e55b41ab9f5be018dfca
2015-05-14 13:02:14 -07:00
Robert Greenwalt
a1a2c91b7d
Merge "Remove phone information for a secondary user"
2015-05-13 21:20:51 +00:00
Nick Kralevich
1cfc2fc41d
Merge "Avoid SElinux denial accessing SIM card lock"
2015-05-11 19:45:21 +00:00
Chad Brubaker
2ed7fc80ff
Merge "Track keystore password method changes"
2015-05-11 19:30:45 +00:00
Chad Brubaker
6c3b678ca2
Track keystore password method changes
...
(cherry-picked from commit 7236f2abba
)
Change-Id: I324914c00195d762cbaa8c63084e41fa796b7df8
2015-05-11 11:21:55 -07:00
Hemanth kumar B
bef7221a7d
Avoid SElinux denial accessing SIM card lock
...
This change avoids the following SELinux denial:
W/SharedPreferenc(28238): type=1400 audit(0.0:8): avc: denied\
{ search } for name="com.android.settings" dev="mmcblk0p25"\
ino=8209 scontext=u:r:radio:s0 tcontext=u:object_r:system_app\
_data_file:s0 tclass=dir op_res=-13 ppid=318 pcomm="main"\
tgid=1850 tgcomm="m.android.phone"
When accessing Settings->Security->Set up SIM card lock.
There is really no need to store this information in
SharedPreferences anyway.
Change-Id: I3ba30d5d5e2c5b3c379397fbb06325101acaf490
2015-05-10 17:21:35 +02:00
Raju Yadav
05fb069d65
Remove phone information for a secondary user
...
Default phone information is not available for a secondary
user and when accessed using service command *#*#INFO#*#*,
it causes crash in Settings. Removed the preference for a
secondary user.
To verify:
1. Add user(slide down status bar>user icon>Add user>
OK>finish the setup guide).
2. As new user launch Phone app>input “*#*#4636#*#*”>
tap Phone information>check
Causes Settings to crash with:
Caused by: java.lang.IllegalStateException: Default phones haven't been made yet!
at com.android.internal.telephony.PhoneFactory.getDefaultPhone(PhoneFactory.java:214)
at com.android.settings.RadioInfo.onCreate(RadioInfo.java:263)
at android.app.Activity.performCreate(Activity.java:5990)
at android.app.Instrumentation.callActivityOnCreate(Instrumentation.java:1106)
at android.app.ActivityThread.performLaunchActivity(ActivityThread.java:2278)
Change-Id: Ie23107c5eead04183cfd8b5460a9a7a3426a99b8
2015-05-07 20:22:24 +02:00
Nick Kralevich
a6867f55e5
Merge "Avoid SElinux denial accessing IMEI information"
2015-05-07 18:21:18 +00:00
Raju Yadav
b2ad5bb522
Avoid SElinux denial accessing IMEI information
...
Set persistent attribute to false so preferences are not
stored in shared preferences, this avoids the SElinux
denial:
W/SharedPreferenc( 6950): type=1400 audit(0.0:4): avc: \
denied { search } for name="com.android.settings" \
dev="mmcblk0p25" ino=48929 scontext=u:r:radio:s0 \
tcontext=u:object_r:system_app_data_file:s0 tclass=dir\
op_res=-13 ppid=319 pcomm="main" tgid=1589\
tgcomm="m.android.phone"
Observed when entering IMEI information in:
Settings > About Phone > Status > IMEI information.
It makes no sense to store this information in shared
preferences anyway so no functinoality is lost with this
change.
Change-Id: Id778bbadc8141167d679177b39e1d7a540d5752c
2015-05-07 19:18:39 +02:00
Elliott Hughes
a9657f553d
Merge "Add Pacific/Noumea."
2015-04-28 20:41:53 +00:00
Elliott Hughes
23ae8827c1
Add Pacific/Noumea.
...
Also move Majuro to the right place in the list. It's +11, not -11.
Bug: http://b/20417019
Change-Id: I0148a33bf542e9fb5bec77f81216a82180053c3d
2015-04-28 13:35:25 -07:00
Alan Viverette
93ecb1f012
Merge "Settings: Fix wifi developer options summaries"
2015-04-24 18:05:10 +00:00
Elliott Hughes
2e30bff135
Merge "Add Europe/Madrid."
2015-04-16 15:03:03 +00:00
Elliott Hughes
09ca2a9823
Add Europe/Madrid.
...
50 million Spaniards can't be wrong.
Bug: 19519953
Change-Id: I10712165d32d90977453e7053057e6260c005f84
2015-04-15 17:37:16 -07:00
Elliott Hughes
189d7e8e51
Merge "Add Europe/Istanbul timezone"
2015-04-02 17:19:27 +00:00
Samuel Asteberg
7019943855
Add Europe/Istanbul timezone
...
Change-Id: I522107e7aead4d7ec587a19202af23df71d16d83
2015-04-02 18:18:24 +02:00
Elliott Hughes
49fe5084f7
Merge "add Recife timezone"
2015-04-01 23:55:55 +00:00
Michael Bestas
4566fc2e81
Settings: Fix wifi developer options summaries
...
Change-Id: I85688d59685d3a0b0a48e51581eee77ebc7cd2fa
2015-03-20 21:54:49 +02:00
Geoff Mendal
cfad6fc1ff
Import translations. DO NOT MERGE
...
Change-Id: I6e606f63db232302aa02be469a2560a5455eb11e
Auto-generated-cl: translation import
2015-02-26 13:08:22 -08:00
Sanket Padawe
4a7ca7d5a7
am bdfdf07c
: am 0362e870
: am 7e21fa5a
: Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
...
* commit 'bdfdf07ce3b788d2962f75027f6be615c9784e10':
Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
2015-02-13 00:01:08 +00:00
Sanket Padawe
bdfdf07ce3
am 0362e870
: am 7e21fa5a
: Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
...
* commit '0362e870b258b03ec06110d032b521cac3d37bf2':
Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
2015-02-12 23:55:01 +00:00
Sanket Padawe
0362e870b2
am 7e21fa5a
: Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
...
* commit '7e21fa5ab4f867263088a38ed279d889b902a05b':
Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
2015-02-12 23:47:52 +00:00
Sanket Padawe
7e21fa5ab4
Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
...
Bug: 19363726
Change-Id: Id4194deb126323b2f7674c58f9911f892793dff4
2015-02-12 12:39:34 -08:00
Geoff Mendal
785bfe719c
am 31010cc1
: (-s ours) Import translations. DO NOT MERGE
...
* commit '31010cc15530338fdcf4e1a66a47d29c6851cbc6':
Import translations. DO NOT MERGE
2015-02-12 19:20:43 +00:00
Geoff Mendal
31010cc155
Import translations. DO NOT MERGE
...
Change-Id: I130d234905731c2df5249e2c769c572bbb61f94e
Auto-generated-cl: translation import
2015-02-12 11:05:53 -08:00
Alex Klyubin
e029b91c53
am 1d33bca0
: Merge "Hidden ApplicationInfo flags are now in privateFlags."
...
* commit '1d33bca0e496f980ec1a364f58cccd457d40954a':
Hidden ApplicationInfo flags are now in privateFlags.
2015-02-11 19:47:09 +00:00
Alex Klyubin
1d33bca0e4
Merge "Hidden ApplicationInfo flags are now in privateFlags."
2015-02-11 19:27:25 +00:00
Geoff Mendal
f513ca2fa1
am d232a3fa
: (-s ours) am 60d2ee87
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'd232a3fa5c86f19ccf559bf4dc649d39d3620ca3':
2015-02-11 19:20:15 +00:00
Alex Klyubin
cc254f4da9
Hidden ApplicationInfo flags are now in privateFlags.
...
See b9f8a5204a1b0b3919fa921e858d04124c582828.
Change-Id: I98bbe4b1a5ac0939e0000e4da8b21a1964c75e8b
2015-02-11 11:10:12 -08:00
Geoff Mendal
d232a3fa5c
am 60d2ee87
: (-s ours) Import translations. DO NOT MERGE
...
* commit '60d2ee878896ccf29f99b825cdbae75182ed41f3':
Import translations. DO NOT MERGE
2015-02-11 15:03:56 +00:00
Geoff Mendal
96a90af83b
Import translations. DO NOT MERGE
...
automerge: 60d2ee8
-s ours
* commit '60d2ee878896ccf29f99b825cdbae75182ed41f3':
Import translations. DO NOT MERGE
2015-02-11 15:00:50 +00:00
Geoff Mendal
60d2ee8788
Import translations. DO NOT MERGE
...
Change-Id: I7d22626907a0705a5de9956d740ed6ddaf9a6ca0
Auto-generated-cl: translation import
2015-02-11 06:50:09 -08:00
Geoff Mendal
278c81a626
am 37dfabff
: (-s ours) am 713e794d
: (-s ours) Import translations. DO NOT MERGE
...
* commit '37dfabff82bd78d0956f41868579bdf5eb885078':
Import translations. DO NOT MERGE
2015-02-09 16:31:32 +00:00
Geoff Mendal
37dfabff82
am 713e794d
: (-s ours) Import translations. DO NOT MERGE
...
* commit '713e794dac88e4e977faa95da88163db6a568e15':
Import translations. DO NOT MERGE
2015-02-09 16:07:10 +00:00
Geoff Mendal
713e794dac
Import translations. DO NOT MERGE
...
Change-Id: I0bbc9548cc2af07fd420ef97b5b39fe07b96c4d8
Auto-generated-cl: translation import
2015-02-09 06:31:43 -08:00
Geoff Mendal
2a9fef1ae7
Import translations. DO NOT MERGE
...
automerge: 40e66bc
-s ours
* commit '40e66bce6ceea1b2b9d49a26564665222eb32745':
Import translations. DO NOT MERGE
2015-02-04 15:04:49 +00:00
Geoff Mendal
40e66bce6c
Import translations. DO NOT MERGE
...
Change-Id: I6c5b25e39ed6da72c5e7a85329947bec91032120
Auto-generated-cl: translation import
2015-02-04 06:50:08 -08:00
Amith Yamasani
47ba346e1e
Merge "set tapjacking protection for deviceadmin permission dialog"
...
automerge: 6317e06
* commit '6317e06635ed52a9d1c1aeb0439017418f57ad0f':
set tapjacking protection for deviceadmin permission dialog
2015-02-03 21:29:19 +00:00
Amith Yamasani
6317e06635
Merge "set tapjacking protection for deviceadmin permission dialog"
2015-02-03 21:24:51 +00:00
Sanket Padawe
2493118a3c
Merge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev automerge: 4decadb
...
automerge: c1af278
* commit 'c1af278c9da7f355fd9da883efb88a3e4d0f3b19':
Remove SimDialogActivity from recents app list.
2015-02-03 18:19:05 +00:00
Sanket Padawe
c1af278c9d
Merge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev
...
automerge: 4decadb
* commit '4decadbc44b12cca8790b4d27ab9c29e34cb9909':
Remove SimDialogActivity from recents app list.
2015-02-03 18:14:03 +00:00
Sanket Padawe
4decadbc44
Merge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev
2015-02-03 18:10:47 +00:00
Andres Morales
4bd31b9ac6
am 2e75203a
: Use getDefaultAdapter instead of getNfcAdapter
...
automerge: 98d8a49
* commit '98d8a490d5930c9f6179c8aefe792012c542ddbb':
Use getDefaultAdapter instead of getNfcAdapter
2015-02-03 16:01:45 +00:00
Andres Morales
98d8a490d5
am 2e75203a
: Use getDefaultAdapter instead of getNfcAdapter
...
* commit '2e75203a6ecb81725b68bced6c5f8d5be37365f1':
Use getDefaultAdapter instead of getNfcAdapter
2015-02-03 15:53:17 +00:00
Sanket Padawe
ffd96559e7
Remove SimDialogActivity from recents app list.
...
Bug: 19237301
Change-Id: I09f12c16e5afc0058f19f92ffbfd930fa099fd9b
2015-02-02 16:46:55 -08:00
Andres Morales
2e75203a6e
Use getDefaultAdapter instead of getNfcAdapter
...
getNfcAdapter can throw an exception if NFC is not
available
Bug: 19227597
Change-Id: Ib95849057938066dc5760a34f16333f5423ce61f
2015-02-02 13:39:57 -08:00
Geoff Mendal
c202347d6e
am 0bb8ba32
: (-s ours) Import translations. DO NOT MERGE
...
* commit '0bb8ba322e0bed9d988e14888079c5d6283cfacc':
Import translations. DO NOT MERGE
2015-02-02 15:30:26 +00:00
Geoff Mendal
0bb8ba322e
Import translations. DO NOT MERGE
...
Change-Id: I3dc578880274b5d2625b2686be2cd56589bb486a
Auto-generated-cl: translation import
2015-02-02 06:52:47 -08:00
Robin Lee
70dbf05d50
am 528c64e2
: Merge "Repair broken keychain wifi_uid logic" into lmp-mr1-dev
...
automerge: d16231d
* commit 'd16231de248aeb5aeccb8f4aa226a2f1b34cc082':
Repair broken keychain wifi_uid logic
2015-02-02 11:45:57 +00:00