Commit Graph

7503 Commits

Author SHA1 Message Date
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

* commit '6317e06635ed52a9d1c1aeb0439017418f57ad0f':
  set tapjacking protection for deviceadmin permission dialog
2015-02-03 21:29:19 +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
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

* commit 'd16231de248aeb5aeccb8f4aa226a2f1b34cc082':
  Repair broken keychain wifi_uid logic
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
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
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

* commit '49c85c4356ccfcb622e501b57d2893fc7e40bce0':
  Fixed data connection toggle crash in Settings.
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 (ag/591931), SDP is performed when the
pairing dialog pops up. There are multiple problems with this. On badly
behaved devices an SDP request might trigger pairing from the remote
side, other devices (like Logitech keyboards) will close the connection
once SDP disconnects, causing the pairing to fail.

Further more, fetchUuidsWithSdk() is an asynchronous call. The code that
was added does not wait for SDP to complete. Thus the check for the PBAP
UUID will always fail and cause the permission check to still be
displayed.

With this change, SDP is not performed when the dialog is popped up and
PBAP permission is granted after bonding and subsequent service
discovery in accordance with final consensus in bug 16964116.

Bug: 18948640
Change-Id: I149afa8ae59b63f59ba579c12f97c3ea3d70112c
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
Sanket Padawe
56b16015bc am 872ed290: am b57e1f29: Merge "Fixed missing sim card lock setup in Security Settings." into lmp-mr1-dev
* commit '872ed290de26374bb1ce9a2e43b0f75c79125ee6':
  Fixed missing sim card lock setup in Security Settings.
2015-01-15 00:42:24 +00:00
Sanket Padawe
2c19066e00 am 0f9db227: am e79b65d6: Merge "Fixed data connection toggle UI issue due to local cache maintained." into lmp-mr1-dev
* commit '0f9db227ec110e9344f9d4f96ff983780531eb76':
  Fixed data connection toggle UI issue due to local cache maintained.
2015-01-15 00:42:23 +00:00
Sanket Padawe
b57e1f2964 Merge "Fixed missing sim card lock setup in Security Settings." into lmp-mr1-dev 2015-01-14 23:20:05 +00:00
Sanket Padawe
e79b65d6c6 Merge "Fixed data connection toggle UI issue due to local cache maintained." into lmp-mr1-dev 2015-01-14 23:18:13 +00:00
Sanket Padawe
247842017e Fixed missing sim card lock setup in Security Settings.
Bug: 19008335
Change-Id: I078169b5a0215a9219e24554e71df32753213ebe
2015-01-14 14:48:27 -08:00
Sanket Padawe
d819270f0f Fixed data connection toggle UI issue due to local cache maintained.
+ Fixed the scenario wherein more than 1 sim cannot be "On" at the same time.

Bug: 18916033
Change-Id: Ia95b54c9ee29d360a1b4542f00a9f698615912bb
2015-01-14 11:03:33 -08:00
Lucky Zhang
591a091311 am 585b53e6: am 0325a858: Merge "[Settings] Wifi Setup responds to other connection state change" into lmp-mr1-dev
* commit '585b53e6d2ddc0725ce69f6f7208ad791e8d256e':
  [Settings] Wifi Setup responds to other connection state change
2015-01-14 12:06:43 +00:00
Svetoslav
6cfe799654 Settings not showing print jobs for a managed profile.
The settings app is shared among the personal and work profiles.
When fetching print jobs it was not getting the ones for the work
profile, rather the ones for the current user which is the personal
profile.

bug:18867406

Change-Id: I99f8cf3a3e2b133a0a4d5a8915473d1190e205f4
2015-01-13 18:48:33 -08:00
Lucky Zhang
0325a85849 Merge "[Settings] Wifi Setup responds to other connection state change" into lmp-mr1-dev 2015-01-14 01:36:45 +00:00
Lucky Zhang
9fe89bbb2e [Settings] Wifi Setup responds to other connection state change
Made use of the two new extras isNetworkRequired and ifWifiRequired in
deciding the ui state of the wifi setting. The CL that adds these
extras in setup wizard is here (http://ag/612291).

Added logic to update the next ("skip") button state accordingly:

(1) "Skip" button should be enabled if
    - wifi is not required and network is not required
    - or wifi is not required, but network is required, and we have a
      valid network connection

(2) "Skip" button should be disabled if
    - wifi is required
    - or wifi is not required, but network is required, and we have
      no valid network connection

Note that the newly added logic is only run if wifi is not connected. If
wifi is already connected, the next button will show "next" and be
enabled.

This fixes the bug where wifi settings in setup wizard does not respond
to mobile data connection change.

Bug: 18783746
Change-Id: I155dcb158f790dd96a71099339f64b64cc647da0
2015-01-13 17:20:42 -08:00
Wink Saville
1015f08455 am a908d819: am 718c4d9b: Rename reg/unreg OnSubscriptionsChangedListener.
* commit 'a908d8191acf3e4786933d67a1a4211543323a7d':
  Rename reg/unreg OnSubscriptionsChangedListener.
2015-01-13 19:16:05 +00:00
Wink Saville
718c4d9b19 Rename reg/unreg OnSubscriptionsChangedListener.
To addOnSubscriptionsChangedListener and
removeOnSubscriptionsChangedListener.

Bug: 18984103
Change-Id: I6636905093812af89c1c3702840e44c8c5ea891f
2015-01-13 08:36:25 -08:00
Sanket Padawe
dd0a5db0dd am 058b0561: Merge "Display Voice nw type if Data nw is Unknown for Sprout." into lmp-mr1-dev automerge: 270af42
* commit '058b0561b3712f19aba28020dad3cd63762050f5':
  Display Voice nw type if Data nw is Unknown for Sprout.
2015-01-09 19:17:18 +00:00
Sanket Padawe
270af427cd Merge "Display Voice nw type if Data nw is Unknown for Sprout." into lmp-mr1-dev 2015-01-09 19:08:26 +00:00
Sanket Padawe
c7e5b42ac4 am 0c3b1371: am f5a4abc2: Merge "Fixed Cellular data toggling issue in settings for multisim" into lmp-mr1-dev
* commit '0c3b13718defb18191120c578c1658c26c4d13e0':
  Fixed Cellular data toggling issue in settings for multisim
2015-01-08 23:19:38 +00:00
Sanket Padawe
f5a4abc205 Merge "Fixed Cellular data toggling issue in settings for multisim" into lmp-mr1-dev 2015-01-08 23:09:11 +00:00
Sanket Padawe
4201391899 Display Voice nw type if Data nw is Unknown for Sprout.
For multisim device when default data connection is set to 1st sim,
getDataNetworkType() returns Unknown for 2nd sim. In that case use
getVoiceNetworkType() to display Cellular nw type in sim status.

Bug: 18922147
Change-Id: Id7c39f8717737b60bde988cbd1c85ce8f6768a6f
2015-01-08 12:37:34 -08:00
Sanket Padawe
24f834d745 Fixed Cellular data toggling issue in settings for multisim
Bug: 18916033
Bug: 18779784
Change-Id: Ifda57b5ae89268f921ee2b75b5b6d90d75514540
2015-01-08 11:23:11 -08:00