drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
200,230 Commits 1 Branch 0 Tags
Commit Graph

103 Commits

Author SHA1 Message Date
Sanket Padawe
cb9d3de032 am f1a9868e: am 0a66123f: am 233bd3ce: Merge "Changes security for Passpoint to EAP security from "Passpoint"." into mnc-dev 
* commit 'f1a9868e18d1feb56434313701faaf52473f0942':
  Changes security for Passpoint to EAP security from "Passpoint".
 2015-07-14 00:20:55 +00:00
Sanket Padawe
f1a9868e18 am 0a66123f: am 233bd3ce: Merge "Changes security for Passpoint to EAP security from "Passpoint"." into mnc-dev 
* commit '0a66123f62f5d28bbef4f88a32c6de97caab3cfe':
  Changes security for Passpoint to EAP security from "Passpoint".
 2015-07-13 23:33:40 +00:00
Sanket Padawe
0a66123f62 am 233bd3ce: Merge "Changes security for Passpoint to EAP security from "Passpoint"." into mnc-dev 
* commit '233bd3ceffbe247b5230f2832ad63c6cf1d9ed13':
  Changes security for Passpoint to EAP security from "Passpoint".
 2015-07-13 22:30:37 +00:00
Geoff Mendal
7d54030b1c Import translations. DO NOT MERGE 
Change-Id: Idc7b4739005f2d06bf0dd38bfdb18f5c205dc5eb
Auto-generated-cl: translation import
 2015-07-11 13:12:45 -05:00
Sanket Padawe
194cce695b Changes security for Passpoint to EAP security from "Passpoint". 
Bug: 22402754
Change-Id: I3afbb6f3f446657a3e9505122032f4edc6401302
 2015-07-10 10:53:31 -07:00
Sanket Padawe
9978aef72b am fd1b5726: am af468add: am 58295e71: Merge "Add Null checks while processing pairing cancel intent" into mnc-dev 
* commit 'fd1b57263cc07a3a77d2ee076726758bd1d97d36':
  Add Null checks while processing pairing cancel intent
 2015-07-09 01:56:03 +00:00
Sanket Padawe
fd1b57263c am af468add: am 58295e71: Merge "Add Null checks while processing pairing cancel intent" into mnc-dev 
* commit 'af468addb672ef002dee64376bc06f2bf8c6c0f9':
  Add Null checks while processing pairing cancel intent
 2015-07-09 01:42:19 +00:00
Sanket Padawe
af468addb6 am 58295e71: Merge "Add Null checks while processing pairing cancel intent" into mnc-dev 
* commit '58295e71d293c131508d280f1373d94716348b2e':
  Add Null checks while processing pairing cancel intent
 2015-07-09 01:31:23 +00:00
Sanket Padawe
4d08a485db Add Null checks while processing pairing cancel intent 
Use case: Exception while handling pairing cancel
          Intent received
1. Initiate pairing from DUT to remote
2. Power off DUT after getting pairing popup

Root Cause:Crash observed in settings application

Change-Id: Ia05fe196ecf6a1d4ec26f85b0cf984e23089c728
Fix: Fixed by adding Null check in PairingCancelHandler
 2015-07-09 01:02:03 +00:00
Zoltan Szatmary-Ban
2358d5c3af am e9233f05: am a626f8d8: am 4d2593d3: Merge "Make StorageMeasurement multiprofile aware." into mnc-dev 
* commit 'e9233f0544a1780ce43e4a01c7409cc8fadb23d7':
  Make StorageMeasurement multiprofile aware.
 2015-07-08 11:37:38 +00:00
Zoltan Szatmary-Ban
e9233f0544 am a626f8d8: am 4d2593d3: Merge "Make StorageMeasurement multiprofile aware." into mnc-dev 
* commit 'a626f8d854d65609c71f602d79b0360359e5b5b7':
  Make StorageMeasurement multiprofile aware.
 2015-07-08 11:20:37 +00:00
Zoltan Szatmary-Ban
a626f8d854 am 4d2593d3: Merge "Make StorageMeasurement multiprofile aware." into mnc-dev 
* commit '4d2593d3f2ce052de5000ebec28bc99a12dd5497':
  Make StorageMeasurement multiprofile aware.
 2015-07-08 11:05:12 +00:00
Zoltan Szatmary-Ban
4d2593d3f2 Merge "Make StorageMeasurement multiprofile aware." into mnc-dev 2015-07-08 10:54:10 +00:00
Geoff Mendal
813b167cd6 Import translations. DO NOT MERGE 
Change-Id: Id6958aa309a3c3c778070b94c9d8f969da04124c
Auto-generated-cl: translation import
 2015-07-07 18:56:12 -07:00
Wei Liu
26125e28b1 am 38e932b3: Move NetworkPolicyEditor from Settings packge to settingslib. 
* commit '38e932b37aea8d2f6866c3c879afa188587bcde3':
  Move NetworkPolicyEditor from Settings packge to settingslib.
 2015-07-08 00:51:19 +00:00
Wei Liu
38e932b37a Move NetworkPolicyEditor from Settings packge to settingslib. 
Change-Id: Ibed9b9dabae42a71d77f493fedc3ab1c4343597f
 2015-07-07 17:12:29 -07:00
Jason Monk
e0f79b9851 am b287b04a: am e9b1e365: am d369d074: Merge "Fix wifi crash" into mnc-dev 
* commit 'b287b04af4b098fef8bfa4f8e4ccac927a584e32':
  Fix wifi crash
 2015-07-06 19:00:44 +00:00
Jason Monk
dbd05a98e5 Fix wifi crash 
Handle clearing state for resume on the same worker thread as everything
else, this way there can't be concurrent modification.

Bug: 22040227
Change-Id: I9ac78a19fc126c8103f3218e657ca93911d3890d
 2015-07-06 13:05:43 -04:00
Zoltan Szatmary-Ban
47adcb9fea Make StorageMeasurement multiprofile aware. 
Bug: 22117317
Bug: 22223456
Change-Id: Ic8a5c1fedcf71c5b1fcae04f32c3d9734a098517
 2015-07-03 12:51:38 +01:00
Shirish Kalele
18aa304fce am 869c230c: Merge "Mark a connection as a Wifi Assistant connection based on the ephemeral flag in WifiInfo. Add this private field to WifiInfo." into mnc-dev 
* commit '869c230c1466e517289d692dce85acf0c30296c4':
  Mark a connection as a Wifi Assistant connection based on the ephemeral flag in WifiInfo. Add this private field to WifiInfo.
 2015-06-26 21:40:39 +00:00
Shirish Kalele
c7a38ef840 Mark a connection as a Wifi Assistant connection based on the 
ephemeral flag in WifiInfo.
Add this private field to WifiInfo.

Change-Id: Ic815b87a24e8272faa6e9e820b8fa55224af882a
 2015-06-26 13:05:22 -07:00
Jason Monk
00270ad218 am 107cb81f: Merge "Make BluetoothEventManager listen to ALIAS_CHANGED" into mnc-dev 
* commit '107cb81f9054a406b94e249c99fd7d64be71faec':
  Make BluetoothEventManager listen to ALIAS_CHANGED
 2015-06-25 14:14:06 +00:00
Jason Monk
107cb81f90 Merge "Make BluetoothEventManager listen to ALIAS_CHANGED" into mnc-dev 2015-06-25 14:05:22 +00:00
Todd Volkert
77d6fac75e am 5f8e4675: Remove unused PermissionsInfo class 
* commit '5f8e4675ae88149b4bf5fff318a88dddb054cf68':
  Remove unused PermissionsInfo class
 2015-06-24 18:24:18 +00:00
Todd Volkert
5f8e4675ae Remove unused PermissionsInfo class 
b/22008424

Change-Id: I53fc04af89c89cc1726dd80b05f2e18d5cc53524
 2015-06-24 11:10:37 -07:00
Vinit Deshpande
035d1838d3 am 725f145e: Merge "Address API review comments" into mnc-dev 
* commit '725f145e0ffe18b2c81dbf07c8cb7633ab99b682':
  Address API review comments
 2015-06-23 02:38:50 +00:00
Vinit Deshpande
a0d929e505 Address API review comments 
Added a flags field in ScanResult; along with flag
values and methods to read them.

Changed types of passpoint related fields.

Bug: 21342042
Bug: 21572290
Bug: 21343777

Change-Id: I413960de88b387853d11b9e10f92665e9c06a81b
 2015-06-22 19:09:38 -07:00
Vinit Deshpande
3f3d4dcdcb am edb83227: Merge "Fix access point list jumping around in WifiSettings" into mnc-dev 
* commit 'edb832271bc036975d9ff8cd1513b6a1e097f3cd':
  Fix access point list jumping around in WifiSettings
 2015-06-20 00:39:46 +00:00
Vinit Deshpande
edb832271b Merge "Fix access point list jumping around in WifiSettings" into mnc-dev 2015-06-20 00:24:33 +00:00
Sanket Padawe
460a292594 am 30a79ec1: Merge "Set default PBAP checkbox state to false (checkbox unselected)." into mnc-dev 
* commit '30a79ec19064220847f5cdc0e58f83bd4a948930':
  Set default PBAP checkbox state to false (checkbox unselected).
 2015-06-19 01:13:09 +00:00
Sanket Padawe
ceeaef3852 Set default PBAP checkbox state to false (checkbox unselected). 
Bug: 20488109
Change-Id: I6259ea8d048cbface2ba63b8c1077af12d0fee1b
 2015-06-18 17:56:08 -07:00
Vinit Deshpande
fcd4612f70 Fix access point list jumping around in WifiSettings 
This happens because the scan times are very aggressive
(to save power); and we don't find all APs on each scan.
So on each scan, some APs are considered lost and some
other are considered found; resulting in reordering the
list.

This change fixes that by requiring 3 scans to confirm
absence of an AP.

Bug: 7263326

Change-Id: I04f61ec5e5aa1589f457645acbf538c7e275a4bf
 2015-06-18 13:41:16 -07:00
Jason Monk
0c8fd1a154 am 4b8704c9: Merge "Don\'t try to get entries for uninstalled apps." into mnc-dev 
* commit '4b8704c9e1024fa7aba66cce03cde78c7e10ba64':
  Don't try to get entries for uninstalled apps.
 2015-06-15 15:54:25 +00:00
Jason Monk
4b8704c9e1 Merge "Don't try to get entries for uninstalled apps." into mnc-dev 2015-06-15 15:41:38 +00:00
Jason Monk
c1f24abd10 Don't try to get entries for uninstalled apps. 
Bug: 21837824
Change-Id: I6f7bbc309e9edf1db12476f55ab8be424739fae0
 2015-06-15 11:38:03 -04:00
Jason Monk
9fed13f8c3 am 5d8c276b: Merge "Make references to ssid use a verbatim TtsSpan" into mnc-dev 
* commit '5d8c276bb91788441ec9a98717017eb01f1b348f':
  Make references to ssid use a verbatim TtsSpan
 2015-06-15 14:23:58 +00:00
Jason Monk
6980d12c58 Make references to ssid use a verbatim TtsSpan 
Bug: 20059794
Change-Id: Id92ef11e78547e168f55515dea2fc28519871d6f
 2015-06-15 10:07:55 -04:00
Jorim Jaggi
ce56792610 am 7bcacc9c: Merge "Animations/success state for external confirm device credentials (1/2)" into mnc-dev 
* commit '7bcacc9c6af19e429bc3681b1559844e5b8fa1ba':
  Animations/success state for external confirm device credentials (1/2)
 2015-06-11 01:32:22 +00:00
Jorim Jaggi
7bcacc9c6a Merge "Animations/success state for external confirm device credentials (1/2)" into mnc-dev 2015-06-10 23:10:10 +00:00
Jason Monk
473da8b618 am b73390ac: Merge "Fix work apps showing as not installed for owner" into mnc-dev 
* commit 'b73390acdd6a71d74d6ad107520a0f22d2bc5f1e':
  Fix work apps showing as not installed for owner
 2015-06-10 15:07:49 +00:00
Neil Fuller
bbb06b322b am 8e095594: Merge "Stop showing long names for local timezones when it is ambiguous" into mnc-dev 
* commit '8e095594a640a82b850ff3990bb690920eba921c':
  Stop showing long names for local timezones when it is ambiguous
 2015-06-10 14:53:54 +00:00
Jason Monk
6ff98ce2c8 Fix work apps showing as not installed for owner 
Bug: 21717956
Change-Id: Ia00537f3b50f958a2e35094abf1bfc73dc1f79af
 2015-06-10 10:18:22 -04:00
Neil Fuller
8e095594a6 Merge "Stop showing long names for local timezones when it is ambiguous" into mnc-dev 2015-06-10 12:23:54 +00:00
Jorim Jaggi
5673353559 Animations/success state for external confirm device credentials (1/2) 
Bug: 20929186
Change-Id: I8ca396e353189da7da3e9c98f841b76c876e461e
 2015-06-09 15:25:40 -07:00
Jason Monk
af3d0cb1f5 am e3fd6de9: Fix build. 
* commit 'e3fd6de9d69e6650f8838e2aee69531fabbe99ca':
  Fix build.
 2015-06-09 18:11:23 +00:00
Jason Monk
e3fd6de9d6 Fix build. 
Change-Id: I560dc798a238173d72e3835962ed82681977dba1
 2015-06-09 13:58:57 -04:00
Tony Mantler
04bb1a809d am 9b0f9a2c: Merge "Tweak ApplicationsState for use by TvSettings" into mnc-dev 
* commit '9b0f9a2c9bc0b6916e5129d14b8b5a4d107ef047':
  Tweak ApplicationsState for use by TvSettings
 2015-06-09 17:53:17 +00:00
Tony Mantler
bdbb5a8d77 Tweak ApplicationsState for use by TvSettings 
b/21328967

Change-Id: I1da8a908491ec4ade7fcc729acf6c08f043cc495
 2015-06-09 10:42:59 -07:00
Tony Mantler
517710e289 am d951d65d: Merge "Move ApplicationsState to SettingsLib" into mnc-dev 
* commit 'd951d65d8ae342118448b8bfb0c59625ee451c2c':
  Move ApplicationsState to SettingsLib
 2015-06-09 17:26:37 +00:00
Tony Mantler
d951d65d8a Merge "Move ApplicationsState to SettingsLib" into mnc-dev 2015-06-09 17:20:19 +00:00