Zach Jang
386c7763eb
am 564ec935: am 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '564ec9357bac62d571ba8ba9d58957477b8b5209':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 21:06:13 +00:00
Zach Jang
00721b4afa
am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit 'c87ceb7ec1a57857ebf169a7d2e1dc05fc9521ec':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 18:58:12 +00:00
Zach Jang
c87ceb7ec1
am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '6ceb2ba9b8928b33c30e0c639539c3fe2f27971e':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-17 20:04:18 +00:00
Zach Jang
6ceb2ba9b8
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings
...
CL#3/3
b/23946860
Change-Id: I2cfcfcbc28d6a1391cae55f505a2b981df9ade2c
2015-09-14 14:03:12 -07:00
Sanket Padawe
5f9d15ed25
am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.
...
* commit '86d853000feca5a627ef87760cdd7df3c3aea1bb':
Check for special char when renaming device for Wi-Fi direct.
2015-08-05 18:28:12 +00:00
Sanket Padawe
19336da3f7
am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.
...
* commit 'ac2347c0bf3c2b9c2ff7d8e2abe0a38d861495c4':
Check for special char when renaming device for Wi-Fi direct.
2015-07-29 19:49:53 +00:00
Sanket Padawe
ac2347c0bf
am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.
...
* commit '158fa952187245ce7b8e9b8c71ee8bd3f23a9cb8':
Check for special char when renaming device for Wi-Fi direct.
2015-07-29 19:25:06 +00:00
Sanket Padawe
158fa95218
am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.
...
* commit 'df9b13af9bff0858c787000f1accee7dd1d2874d':
Check for special char when renaming device for Wi-Fi direct.
2015-07-29 17:08:45 +00:00
Sanket Padawe
df9b13af9b
am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.
...
* commit '74d85949507f3d9fdc75ace2acbec1aa7503b034':
Check for special char when renaming device for Wi-Fi direct.
2015-07-29 16:44:58 +00:00
Sanket Padawe
e05f714315
Check for special char when renaming device for Wi-Fi direct.
...
Bug: 21141820
Change-Id: I78231d95e5ba3f505325d5657f8e6106a887f11e
(cherry picked from commit 7186a47ef3
2015-07-28 16:09:59 +00:00
Stuart Scott
4a682e56c8
am c28e80b8: am 53eec9fa: Fix sim notifications.
...
* commit 'c28e80b8fb1a4fd6d326bbb79547f3597cf0412f':
Fix sim notifications.
2015-03-25 20:34:04 +00:00
Stuart Scott
53eec9faad
Fix sim notifications.
...
bug:19705366
Change-Id: I1d1f2dc5cf1d4580ab503c88853b089db0362242
2015-03-25 18:07:45 +00:00
Sanket Padawe
85b04c19ed
am 130a76c8: am 49d660ac: am 4e838ca9: Merge "Use TelephonyManager api to get SPN of sim to display in UI." into lmp-mr1-dev
...
* commit '130a76c806469b5b814b1d647713dd0cdec1fe9f':
Use TelephonyManager api to get SPN of sim to display in UI.
2015-02-26 23:31:28 +00:00
Sanket Padawe
8f77f435d8
Use TelephonyManager api to get SPN of sim to display in UI.
...
Bug: 19476304
Change-Id: Ia16465584cf31858bbf1ae36cfdbf21184de10d7
2015-02-24 13:30:33 -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
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
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
cc254f4da9
Hidden ApplicationInfo flags are now in privateFlags.
...
See b9f8a5204a1b0b3919fa921e858d04124c582828.
Change-Id: I98bbe4b1a5ac0939e0000e4da8b21a1964c75e8b
2015-02-11 11:10:12 -08:00
Amith Yamasani
47ba346e1e
Merge "set tapjacking protection for deviceadmin permission dialog"
...
automerge: 6317e06
2015-02-03 21:29:19 +00:00
Andres Morales
4bd31b9ac6
am 2e75203a: Use getDefaultAdapter instead of getNfcAdapter
...
automerge: 98d8a49
2015-02-03 16:01:45 +00: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
Robin Lee
70dbf05d50
am 528c64e2: Merge "Repair broken keychain wifi_uid logic" into lmp-mr1-dev
...
automerge: d16231d
2015-02-02 11:45:57 +00:00
Robin Lee
635426b0a7
Repair broken keychain wifi_uid logic
...
Check for cross-user installs was missing a short-circuit for installs
where no UID was specified. This is now added.
Bug: 19194391
Change-Id: I10aa8323b47e0fcabb59e7c30d677080bb80b976
2015-01-30 19:00:45 +00:00
Stephan Huber
dc333212bd
set tapjacking protection for deviceadmin permission dialog
...
Second try to commit tapjacking protection for device administrator permission dialog.
Remplaced tap by spaces
Signed-off-by: Stephan Huber <huber.stephan.sit@gmail.com >
Change-Id: I8e14e713d1f039ca79f5006cdeb12b65652884fb
2015-01-30 14:38:10 +01:00
Sanket Padawe
b33c8ad518
am ef72625b: am ab845180: Remove sim status and imei for secondary user.
...
* commit 'ef72625b5243f2afc6b63553ce57f439801d6977':
Remove sim status and imei for secondary user.
2015-01-30 02:52:06 +00:00
Sanket Padawe
ab84518009
Remove sim status and imei for secondary user.
...
Bug: 19165700
Change-Id: I4cc4b09a66acb3c88ac33e6479b165b6872404c8
2015-01-29 17:19:26 -08:00
Fyodor Kupolov
bd89b7b45e
am 0d5ad3b7: am 57641a8b: am d7e93570: am f11f9f47: Added a check if a custom activity can be started
...
* commit '0d5ad3b73ef524b4aa09e86d3c3a68b48be0d1d1':
Added a check if a custom activity can be started
2015-01-29 18:19:06 +00:00
Fyodor Kupolov
0d5ad3b73e
am 57641a8b: am d7e93570: am f11f9f47: Added a check if a custom activity can be started
...
* commit '57641a8b5080b5122fcdd98c56fffaef90b3992d':
Added a check if a custom activity can be started
2015-01-29 18:09:29 +00:00
Fyodor Kupolov
57641a8b50
am d7e93570: am f11f9f47: Added a check if a custom activity can be started
...
* commit 'd7e93570d35cfec4e5de0f3edc5d326ecdb8a442':
Added a check if a custom activity can be started
2015-01-29 18:02:40 +00:00
Pavel Zhamaitsiak
d67ad203db
resolved conflicts for merge of 23682809 to lmp-mr1-dev-plus-aosp
...
Change-Id: Ia6ad086dad93e5230ec59287d96e736e8d785320
2015-01-28 13:07:57 -08:00
Pavel Zhamaitsiak
882000f39b
Merge "Add button in "hidden" settings to flip "VoLTE Provisioned" flag" into lmp-mr1-dev
2015-01-28 18:59:18 +00:00
Fyodor Kupolov
f11f9f47d3
Added a check if a custom activity can be started
...
AppRestrictionsFragment starts an activity using an intent provided by the
receiver. A check was added to prevent an app from starting an activity that
it does not own.
Bug: 14441412
Change-Id: Ia6820b1daf3783d605b92976c78cb522b17dc8f2
(cherry picked from commit 07ab95c43e
2015-01-28 10:31:36 +00:00
Mick Lin
c0570dc455
am 271aa608: am 09c9e5eb: [DS] Correct the access method for telephony system property
...
* commit '271aa6081c16fe27d4d96f91c9530c7ec7f8b052':
[DS] Correct the access method for telephony system property
2015-01-27 17:22:33 +00:00
Mick Lin
09c9e5eb5d
[DS] Correct the access method for telephony system property
...
Bug: 18675498
Review: https://partner-android-review.git.corp.google.com/#/c/198822
Change-Id: I7d6eab7d8f513de20bd8995b999a124097f725e7
2015-01-27 05:30:47 +00:00
Jeff Sharkey
78ab16692b
am 4ec2b9e6: am 9c167e92: Fix secondary data usage color regression.
...
* commit '4ec2b9e6160b386b70abb43ef2211ff0c6036345':
Fix secondary data usage color regression.
2015-01-26 23:43:41 +00:00
Jeff Sharkey
9c167e92df
Fix secondary data usage color regression.
...
Show overall usage with a 50% transparency when looking at a
specific app details page. (Otherwise you can't tell them apart.)
Bug: 18927935
Change-Id: I0cad1ba0451a9dab3ed90fa5aa53c115dbe3e1d3
2015-01-26 14:18:19 -08:00
Sanket Padawe
d0f3755197
am 2b6ab796: Merge "Hide APNs with type="ia" and apn=""" into lmp-mr1-dev automerge: a8b78f9
...
* commit '2b6ab796f1ba4b6c29eb23eb3e71dd8c107497a9':
Hide APNs with type="ia" and apn=""
2015-01-24 00:06:37 +00:00
Sanket Padawe
a8b78f96ae
Merge "Hide APNs with type="ia" and apn=""" into lmp-mr1-dev
2015-01-23 23:55:13 +00:00
Sanket Padawe
a7f21a3100
Hide APNs with type="ia" and apn=""
...
APNs with type="ia" and no APN address (apn="") are used to
prevent an initial attach APN from being sent to the modem. This
in turn prevents the LTE ESM information procedure from being
used during the LTE attach. These APNs are meaningless and confusing to end users - so this
change hides them from the APN list.
Bug: 19101183
Change-Id: I9aacf787f8c175a301ad546f972f8972aad2a6b3
2015-01-23 09:53:48 -08:00
Zoltan Szatmary-Ban
489d03c0c3
am 400b8016: am 387597a2: Merge "Show removed user\'s data usage under its correct item" into lmp-mr1-dev
...
* commit '400b801664e59ef68072e231849a0e762edcd3c8':
Show removed user's data usage under its correct item
2015-01-23 11:07:57 +00:00
Zoltan Szatmary-Ban
387597a256
Merge "Show removed user's data usage under its correct item" into lmp-mr1-dev
2015-01-23 10:57:14 +00:00
Pavel Zhamaitsiak
cb267a6f8c
Add button in "hidden" settings to flip "VoLTE Provisioned" flag
...
VoLTE Provisioned flag can be lost when new device image is flashed. Currently
there is no way to trigger Verizon provisioning update from device. This patch
adds button in hidden settings which allow to manually change value of the
flag.
Bug: 19038362
Change-Id: I23f13004dbcf9eaf711c66261696772b1d7bfd6e
2015-01-22 02:57:37 +00:00
Sanket Padawe
e3acb02bb5
Merge "Fixed data connection toggle crash in Settings." into lmp-mr1-dev automerge: 5f1eb2d
...
automerge: 49c85c4
2015-01-21 17:20:50 +00:00
Sanket Padawe
766ab606e3
Fixed data connection toggle crash in Settings.
...
Bug: 19066882
Change-Id: Ib2c7b55d059ddda0543f11ded039ac82bc036850
2015-01-20 10:36:15 -08:00
Zoltan Szatmary-Ban
77c1d36de5
Show removed user's data usage under its correct item
...
Users for which UserManager.getUserInfo returned null were shown as
unnamed users on Settings > Data Usage. This behavior has now changed
to show their data usage under the same item as UID_REMOVED.
Bug: 18174376
Change-Id: I8d172647edb51f7a277b4b714e9b7f3a0b5f3154
(cherry picked from commit cd9b1507fb
2015-01-19 10:53:45 +00:00
Andre Eisenbach
b1789780f7
am edf618c1: am 906fc417: Merge "Do not perform SDP during pairing" into lmp-mr1-dev
...
* commit 'edf618c1b7ceb283146de1e26b85a56ab04b206f':
Do not perform SDP during pairing
2015-01-16 02:47:55 +00:00
Andre Eisenbach
906fc41724
Merge "Do not perform SDP during pairing" into lmp-mr1-dev
2015-01-16 02:01:05 +00:00
Andre Eisenbach
63e0f16c63
Do not perform SDP during pairing
...
As a result of commit 7de119c
2015-01-15 11:24:49 -08:00
Svetoslav
942edf4ca6
am 21824675: am 6491d51f: Merge "Settings not showing print jobs for a managed profile." into lmp-mr1-dev
...
* commit '21824675d5343f26fd0c4cda45d60be89d59c59b':
Settings not showing print jobs for a managed profile.
2015-01-15 05:04:51 +00:00
Svetoslav
6491d51fdc
Merge "Settings not showing print jobs for a managed profile." into lmp-mr1-dev
2015-01-15 04:47:54 +00:00
