Commit Graph

22459 Commits

Author SHA1 Message Date
Geoff Mendal
052e50dd7f Import translations. DO NOT MERGE
Change-Id: I4a7a4c47fd5d7cb61a2cc319bcfd33867bb234be
Auto-generated-cl: translation import
2015-08-03 07:08:05 -07:00
Geoff Mendal
8655be287d am c2d8a523: (-s ours) am 5d4bd09d: (-s ours) am bd24631d: (-s ours) Import translations. DO NOT MERGE
* commit 'c2d8a52393941f7019ce81c3a3a523871bd8680f':
  Import translations. DO NOT MERGE
2015-08-01 17:03:47 +00:00
Vinit Deshpande
bce70a1f9b am 2fbcdd34: am 5bfa8d8a: am 5acb871c: am b74c0b2a: Merge "wifi: Check for the sizeof ssid to start SoftAP" into mnc-dev
* commit '2fbcdd3479df61625d80e9e025352e37cf65cd70':
  wifi: Check for the sizeof ssid to start SoftAP
2015-08-01 17:03:46 +00:00
Jim Miller
8ea975c128 am bb89abea: am d0c09c48: am 0a8b6f2b: am efaa19d9: Fix fingerprint enrolling bug.
* commit 'bb89abeaff323762f77fb8ed97dda910cc171fee':
  Fix fingerprint enrolling bug.
2015-08-01 17:03:45 +00:00
Maurice Lam
de4a53624f am e39a99e1: am 87e9d8ac: am 9d490b50: am 88832a3d: Merge "[Fingerprint] Disable back in setup enrolling screen" into mnc-dev
* commit 'e39a99e1d5b516f95df03befe5797efc94ffc882':
  [Fingerprint] Disable back in setup enrolling screen
2015-08-01 17:03:44 +00:00
Geoff Mendal
2f0ef73c31 am 1435018e: (-s ours) am b87bbcfb: (-s ours) am bbd70391: (-s ours) am 13cbe053: (-s ours) Import translations. DO NOT MERGE
* commit '1435018e4b5f3380b62d4bc2ac022cdb2c2746bd':
  Import translations. DO NOT MERGE
2015-08-01 17:03:42 +00:00
Geoff Mendal
c2d8a52393 am 5d4bd09d: (-s ours) am bd24631d: (-s ours) Import translations. DO NOT MERGE
* commit '5d4bd09d8531141489d2ba2914ad40ef056a1466':
  Import translations. DO NOT MERGE
2015-08-01 16:51:51 +00:00
Vinit Deshpande
2fbcdd3479 am 5bfa8d8a: am 5acb871c: am b74c0b2a: Merge "wifi: Check for the sizeof ssid to start SoftAP" into mnc-dev
* commit '5bfa8d8a77e04ce9131e6d8406b41f73d2a469ce':
  wifi: Check for the sizeof ssid to start SoftAP
2015-08-01 16:51:49 +00:00
Jim Miller
bb89abeaff am d0c09c48: am 0a8b6f2b: am efaa19d9: Fix fingerprint enrolling bug.
* commit 'd0c09c48aec75cffc7cbcea1d5e2aa1e90ac7ab7':
  Fix fingerprint enrolling bug.
2015-08-01 16:51:48 +00:00
Maurice Lam
e39a99e1d5 am 87e9d8ac: am 9d490b50: am 88832a3d: Merge "[Fingerprint] Disable back in setup enrolling screen" into mnc-dev
* commit '87e9d8acd14033839dc1f4f128afc29f089ed8c2':
  [Fingerprint] Disable back in setup enrolling screen
2015-08-01 16:51:47 +00:00
Geoff Mendal
1435018e4b am b87bbcfb: (-s ours) am bbd70391: (-s ours) am 13cbe053: (-s ours) Import translations. DO NOT MERGE
* commit 'b87bbcfbd6afd29f10bbf64556267221f5b85a3c':
  Import translations. DO NOT MERGE
2015-08-01 16:51:45 +00:00
Geoff Mendal
5d4bd09d85 am bd24631d: (-s ours) Import translations. DO NOT MERGE
* commit 'bd24631d2e468119eeab658d434dead4d05f56b7':
  Import translations. DO NOT MERGE
2015-08-01 16:38:45 +00:00
Vinit Deshpande
5bfa8d8a77 am 5acb871c: am b74c0b2a: Merge "wifi: Check for the sizeof ssid to start SoftAP" into mnc-dev
* commit '5acb871c0b7660a63f7b0708b65673a2f63fb165':
  wifi: Check for the sizeof ssid to start SoftAP
2015-08-01 16:38:12 +00:00
Jim Miller
d0c09c48ae am 0a8b6f2b: am efaa19d9: Fix fingerprint enrolling bug.
* commit '0a8b6f2b9a1b16831565c932b707c59f2ec36491':
  Fix fingerprint enrolling bug.
2015-08-01 16:37:53 +00:00
Maurice Lam
87e9d8acd1 am 9d490b50: am 88832a3d: Merge "[Fingerprint] Disable back in setup enrolling screen" into mnc-dev
* commit '9d490b50406387a55dc3976cf3cf14ef09d9f98e':
  [Fingerprint] Disable back in setup enrolling screen
2015-08-01 16:34:40 +00:00
Geoff Mendal
b87bbcfbd6 am bbd70391: (-s ours) am 13cbe053: (-s ours) Import translations. DO NOT MERGE
* commit 'bbd703914a81b63e15e32a3530d815298f4a6f8c':
  Import translations. DO NOT MERGE
2015-08-01 16:34:39 +00:00
Geoff Mendal
bd24631d2e Import translations. DO NOT MERGE
Change-Id: I1d0459c20f362248d4d3b065a2d4f6c653555d7a
Auto-generated-cl: translation import
2015-07-31 20:47:02 -07:00
Vinit Deshpande
5acb871c0b am b74c0b2a: Merge "wifi: Check for the sizeof ssid to start SoftAP" into mnc-dev
* commit 'b74c0b2a27f4d30628fe4482a9de6387c6dbdaca':
  wifi: Check for the sizeof ssid to start SoftAP
2015-08-01 00:35:02 +00:00
Vinit Deshpande
b74c0b2a27 Merge "wifi: Check for the sizeof ssid to start SoftAP" into mnc-dev 2015-08-01 00:26:01 +00:00
Sanket Padawe
a7a4a5a2cf Allow Contact sharing by default while connecting Car Kit.
Bug: 22556703
Change-Id: I335115bd1f6a2b043fb2ac8eeb1f9512b542e030
2015-07-31 17:22:45 -07:00
Sunil Dutt
48c3656944 wifi: Check for the sizeof ssid to start SoftAP
Disable the option to start SoftAP if ssid byte length is over 32 bytes.

Bug: 22074821

Change-Id: I696dca1aac8673bff168481fde4b013450bac72c
2015-07-31 17:20:17 -07:00
Jim Miller
0a8b6f2b9a am efaa19d9: Fix fingerprint enrolling bug.
* commit 'efaa19d97d4aba1897357971af4c0991af71dbbd':
  Fix fingerprint enrolling bug.
2015-07-31 23:48:15 +00:00
Jim Miller
efaa19d97d Fix fingerprint enrolling bug.
This fixes a bug where rotating the device would call post_enroll()
too early, thus invalidating the current session.

Fixes bug 22708390

Change-Id: Ib4a334b50c16630b4fe4b451f6019d41225b2011
2015-07-31 23:17:24 +00:00
Maurice Lam
9d490b5040 am 88832a3d: Merge "[Fingerprint] Disable back in setup enrolling screen" into mnc-dev
* commit '88832a3d4d48b94a3c43a6240dff75b5d486681b':
  [Fingerprint] Disable back in setup enrolling screen
2015-07-31 19:43:17 +00:00
Geoff Mendal
bbd703914a am 13cbe053: (-s ours) Import translations. DO NOT MERGE
* commit '13cbe05387fe387c88f39f9121a8283121e96bdc':
  Import translations. DO NOT MERGE
2015-07-31 19:41:55 +00:00
Maurice Lam
88832a3d4d Merge "[Fingerprint] Disable back in setup enrolling screen" into mnc-dev 2015-07-31 18:50:39 +00:00
Geoff Mendal
13cbe05387 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 22512392
Change-Id: I2a2bc8f493371e83373ec3587008f51a3cecc011
2015-07-31 09:34:46 -07:00
Jeff Sharkey
50c01eb2e8 am 709ad25c: am 7c59a133: am b456493a: am c7e59e52: Merge "Let Settings measure transient free space." into mnc-dev
* commit '709ad25c7393ee54552240702878bd78bdd8cb97':
  Let Settings measure transient free space.
2015-07-31 02:07:36 +00:00
Jeff Sharkey
709ad25c73 am 7c59a133: am b456493a: am c7e59e52: Merge "Let Settings measure transient free space." into mnc-dev
* commit '7c59a133efe64c2a34f5a5743c67076f7a9e4a1e':
  Let Settings measure transient free space.
2015-07-31 02:03:37 +00:00
Jeff Sharkey
7c59a133ef am b456493a: am c7e59e52: Merge "Let Settings measure transient free space." into mnc-dev
* commit 'b456493ad5097dd3713649deeb8452e498c55ea9':
  Let Settings measure transient free space.
2015-07-31 01:57:38 +00:00
Jeff Sharkey
b456493ad5 am c7e59e52: Merge "Let Settings measure transient free space." into mnc-dev
* commit 'c7e59e52b45b66de74597a455023dd9fe4e07b3b':
  Let Settings measure transient free space.
2015-07-31 01:51:31 +00:00
Jeff Sharkey
c7e59e52b4 Merge "Let Settings measure transient free space." into mnc-dev 2015-07-31 01:46:44 +00:00
Maurice Lam
824bcec98d am 0d1f08cb: am e2d4c5e8: am 09840984: am 997bcaa7: Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev
* commit '0d1f08cb79b0de41a8c1c13332e2a01ed409e2a2':
  [Fingerprint] Advertise wake & unlock during SUW
2015-07-31 01:09:13 +00:00
Maurice Lam
0d1f08cb79 am e2d4c5e8: am 09840984: am 997bcaa7: Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev
* commit 'e2d4c5e8cce1f867db924fdfe737e51774c9109f':
  [Fingerprint] Advertise wake & unlock during SUW
2015-07-31 01:01:18 +00:00
Maurice Lam
e2d4c5e8cc am 09840984: am 997bcaa7: Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev
* commit '09840984e317c12d3ead3b1d16c65844f363e8c5':
  [Fingerprint] Advertise wake & unlock during SUW
2015-07-31 00:55:16 +00:00
Jeff Sharkey
5738266449 Let Settings measure transient free space.
Transient volumes like USB drives are only mounted at /mnt/media_rw,
but they still appear in Settings > Storage.  To show stats like
free/used space, give Settings the permissions it needs to access
devices mounted there.

Bug: 22545248
Change-Id: I50be38f02f7d2bfe51d1ac0f76a04c340a21f936
2015-07-30 17:51:28 -07:00
Maurice Lam
09840984e3 am 997bcaa7: Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev
* commit '997bcaa7d8486814540d8bcf1269918d8c48d960':
  [Fingerprint] Advertise wake & unlock during SUW
2015-07-31 00:48:43 +00:00
Maurice Lam
997bcaa7d8 Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev 2015-07-31 00:43:58 +00:00
Maurice Lam
5656314aca [Fingerprint] Advertise wake & unlock during SUW
Adds a string to advertise to the user that wake & unlock is
available on all fingerprint devices.

Bug: 22644642
Change-Id: I9e44174c6ab088a06f95ae5c377c8ccec13a4257
2015-07-30 17:02:26 -07:00
Nick Kralevich
8a9b03f746 UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER
In ec323a0849, DISALLOW_USB_FILE_TRANSFER
turned off all USB options except for "Charge Only". This is too
aggressive. MIDI should be available when DISALLOW_USB_FILE_TRANSFER
is set.

Remove mUsbManager.isUsbDataUnlocked(). That data is available
by accessing the sticky broadcast.

Bug: 22447614
Bug: 21429947
Change-Id: Icd8398c4cf43f807acf77923b0b25c18f9a9b0d0
2015-07-30 16:34:01 -07:00
Geoff Mendal
0540c147c9 am 109ba8ed: (-s ours) am dc3e92c2: (-s ours) am d5974497: (-s ours) am 6b0a2d21: (-s ours) Import translations. DO NOT MERGE
* commit '109ba8ed33d25102af265c76b339803a25da0456':
  Import translations. DO NOT MERGE
2015-07-30 23:28:47 +00:00
Geoff Mendal
109ba8ed33 am dc3e92c2: (-s ours) am d5974497: (-s ours) am 6b0a2d21: (-s ours) Import translations. DO NOT MERGE
* commit 'dc3e92c24de06d49a1e62aa73ff1269966efb026':
  Import translations. DO NOT MERGE
2015-07-30 23:20:35 +00:00
Geoff Mendal
dc3e92c24d am d5974497: (-s ours) am 6b0a2d21: (-s ours) Import translations. DO NOT MERGE
* commit 'd5974497caa856fbeb18e482ca0b427873327356':
  Import translations. DO NOT MERGE
2015-07-30 23:16:06 +00:00
Geoff Mendal
d5974497ca am 6b0a2d21: (-s ours) Import translations. DO NOT MERGE
* commit '6b0a2d21e65ab1c29aec925380bbf43bab22c2c1':
  Import translations. DO NOT MERGE
2015-07-30 23:10:36 +00:00
Geoff Mendal
6b0a2d21e6 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 22672924
Change-Id: I99789b790e682308514351a13025b9625ec085e1
2015-07-30 15:54:40 -07:00
Fyodor Kupolov
1b8b5ff01b am 3a3f495e: am 23d4ebdc: am 74f8cb9c: am c3067882: Merge "Added android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev
* commit '3a3f495e2480235a83fdd9c7efe6810f003504bc':
  Added android.permission.PEERS_MAC_ADDRESS permission
2015-07-30 21:21:14 +00:00
Fyodor Kupolov
3a3f495e24 am 23d4ebdc: am 74f8cb9c: am c3067882: Merge "Added android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev
* commit '23d4ebdcccb6a8d030a744b4ae85907b65edc6f3':
  Added android.permission.PEERS_MAC_ADDRESS permission
2015-07-30 21:09:09 +00:00
Fyodor Kupolov
23d4ebdccc am 74f8cb9c: am c3067882: Merge "Added android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev
* commit '74f8cb9c9bf2c354a17ce155977dc9d8bead000a':
  Added android.permission.PEERS_MAC_ADDRESS permission
2015-07-30 21:01:20 +00:00
Fyodor Kupolov
74f8cb9c9b am c3067882: Merge "Added android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev
* commit 'c3067882dbf00e424cd146181cf15f33ecb9f8f8':
  Added android.permission.PEERS_MAC_ADDRESS permission
2015-07-30 20:54:10 +00:00
Fyodor Kupolov
c3067882db Merge "Added android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev 2015-07-30 20:50:03 +00:00