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

277097 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ningyuan Wang
7cad272109 Merge "Add security capabilities enums to ScanResult" am: a3c0324824 
am: 6e67bb87cf

Change-Id: I02934a0a018bf759559d710f2edff1abe49df2cd
 2016-11-17 00:01:23 +00:00
Ningyuan Wang
6e67bb87cf Merge "Add security capabilities enums to ScanResult" 
am: a3c0324824

Change-Id: Iad2aba87155d52343b372b2d7af3e037842c1ca4
 2016-11-16 23:54:24 +00:00
Treehugger Robot
a3c0324824 Merge "Add security capabilities enums to ScanResult" 2016-11-16 23:42:25 +00:00
Yifan Hong
afe46992b8 Merge "Fix include after spliting HidlSupport.h" am: efd7b9f57d 
am: 2f7a3f9595

Change-Id: Id85f0bb5b53ca3a693ab1bf137627159b6d382d5
 2016-11-16 19:16:45 +00:00
Ningyuan Wang
d150b2b001 Add security capabilities enums to ScanResult 
This adds enums of security parameters, including
protocol, key management, and cipher suites.

Bug: 32512793
Test: compile

Change-Id: Ibf784d79695ca5e261c6bfe623406bc693c5ac17
 2016-11-16 11:13:42 -08:00
Yifan Hong
2f7a3f9595 Merge "Fix include after spliting HidlSupport.h" 
am: efd7b9f57d

Change-Id: I6b0b3482feb169ae89ffa6e20561ad64b42d12d1
 2016-11-16 19:10:20 +00:00
Yifan Hong
efd7b9f57d Merge "Fix include after spliting HidlSupport.h" 2016-11-16 19:01:00 +00:00
Andreas Gampe
6a454c86db Merge "Preload2: Fix dependencies" am: 3b379ee94e 
am: 74b4e070be

Change-Id: I6bbc33352648a352ed8be54bb3cb2eb9e065f074
 2016-11-16 18:32:56 +00:00
Andreas Gampe
74b4e070be Merge "Preload2: Fix dependencies" 
am: 3b379ee94e

Change-Id: If3ecad631e5f7deb9b2f348a26d9b41f8a00b4f5
 2016-11-16 18:25:37 +00:00
Treehugger Robot
3b379ee94e Merge "Preload2: Fix dependencies" 2016-11-16 18:15:06 +00:00
Martijn Coenen
6e2c276c78 Merge "Fix deprecated range_x calls." am: 87cafe8f33 
am: d03b17c29a

Change-Id: I70280eb85b9430c23f6b2681375cbcfa9da2dd38
 2016-11-16 10:07:54 +00:00
Martijn Coenen
d03b17c29a Merge "Fix deprecated range_x calls." 
am: 87cafe8f33

Change-Id: Idfbc4e3475cea7e56b3ac72afd61e1e981ef4e5d
 2016-11-16 10:00:23 +00:00
Martijn Coenen
87cafe8f33 Merge "Fix deprecated range_x calls." 2016-11-16 09:48:31 +00:00
Hidenari Koshimae
9f0cc266ce Merge "CountDownTimer: not skip onTick()" am: 224d9e48fa 
am: 9997fcc72c

Change-Id: Ie09949fbc23ad87e159e063a59983a1a6bff98f8
 2016-11-16 08:18:30 +00:00
Hidenari Koshimae
9997fcc72c Merge "CountDownTimer: not skip onTick()" 
am: 224d9e48fa

Change-Id: I7ade5d057e73f53867747c00fcfc5882a57a2f4c
 2016-11-16 08:10:54 +00:00
Treehugger Robot
224d9e48fa Merge "CountDownTimer: not skip onTick()" 2016-11-16 07:55:27 +00:00
longhai
5c152a3d7f Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA." am: 1813ae0159 
am: 2be54fde72

Change-Id: I14e1d5aa6bda143e2a87bba1ea65b8384c44e3a1
 2016-11-16 03:11:09 +00:00
longhai
2be54fde72 Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA." 
am: 1813ae0159

Change-Id: Iae1a0cd25495206d596aed7d68ce7936071f9c6e
 2016-11-16 03:04:38 +00:00
Treehugger Robot
1813ae0159 Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA." 2016-11-16 02:54:26 +00:00
Peter Qiu
2e73b06f63 Merge changes from topic 'HS2 API Cleanup' am: 41fd0f1faf 
am: afb8f37711

Change-Id: I413a4e86233f103767c24b636212faf3fba3dcf9
 2016-11-16 00:18:36 +00:00
Peter Qiu
134706940b wifi: remove unused hidden Hotspot 2.0 Release 1 API am: 1c3054ea87 
am: 1b39c61ce7

Change-Id: Ia81a0d8b77a6031670b89f97d21fc29be9631fb3
 2016-11-16 00:16:30 +00:00
Peter Qiu
31b8e658d3 wifi: remove hidden unused Hotspot 2.0 Release 2 APIs am: a38558b539 
am: a9a9a9bb8d

Change-Id: I5be1220539e5a22e4f0d4e3d52ac85c608ccb950
 2016-11-16 00:14:46 +00:00
Peter Qiu
afb8f37711 Merge changes from topic 'HS2 API Cleanup' 
am: 41fd0f1faf

Change-Id: Ic53fa2cad082484ebbbc9198511b0539dad97382
 2016-11-16 00:04:44 +00:00
Yifan Hong
ddf31f604e Fix include after spliting HidlSupport.h 
Test: mma

Bug: 32756130
Change-Id: Ia4fa02726d79681753fe9c8c7135a28fffb508b4
 2016-11-15 16:02:40 -08:00
Peter Qiu
1b39c61ce7 wifi: remove unused hidden Hotspot 2.0 Release 1 API 
am: 1c3054ea87

Change-Id: I5a13979aedb39ad347099fd25e7515b099b9ac19
 2016-11-16 00:00:06 +00:00
Peter Qiu
a9a9a9bb8d wifi: remove hidden unused Hotspot 2.0 Release 2 APIs 
am: a38558b539

Change-Id: I48766f0c259693496dc9b63ad0dd287b93185787
 2016-11-15 23:59:20 +00:00
Treehugger Robot
41fd0f1faf Merge changes from topic 'HS2 API Cleanup' 
* changes:
  wifi: remove unused hidden Hotspot 2.0 Release 1 API
  wifi: remove hidden unused Hotspot 2.0 Release 2 APIs
 2016-11-15 23:50:18 +00:00
Neil Fuller
ef34053f26 Merge "Correctly handle when the user has no explicit time_12_24 setting" am: 8631e19d38 
am: 98f03f4980

Change-Id: Ia6592370da446e43896fb56d12f734841e137d49
 2016-11-15 16:57:32 +00:00
Neil Fuller
98f03f4980 Merge "Correctly handle when the user has no explicit time_12_24 setting" 
am: 8631e19d38

Change-Id: I70533c5ff4ac8cdeef1b42337bb47b09c8bbf927
 2016-11-15 16:50:29 +00:00
Neil Fuller
8631e19d38 Merge "Correctly handle when the user has no explicit time_12_24 setting" 2016-11-15 16:39:42 +00:00
Martijn Coenen
90213f341d Fix deprecated range_x calls. 
Test: builds
Change-Id: I98412e51a54ef9f9e26c72ecd810dcea77aefdbb
 2016-11-15 09:07:12 +01:00
Peter Qiu
0a5b88e286 Merge "osu: remove calls to deprecated APIs" am: e9514808d7 
am: 30874ed6ed

Change-Id: I43093bf243cb249ad892bdf94ea9781ca734e239
 2016-11-15 04:23:21 +00:00
Peter Qiu
30874ed6ed Merge "osu: remove calls to deprecated APIs" 
am: e9514808d7

Change-Id: If7c31b7d901ef8cc8561b7f0933d803498105e75
 2016-11-15 04:15:59 +00:00
Treehugger Robot
e9514808d7 Merge "osu: remove calls to deprecated APIs" 2016-11-15 03:59:57 +00:00
Svetoslav Ganov
05149e69cb Merge "Add WiFi toggle prompts - framework" into stage-aosp-master 
am: 9f078049cf

Change-Id: I28501fc58e597c1f5e9d4da6bfaa3a015cad1260
 2016-11-15 03:28:20 +00:00
Svetoslav Ganov
23328d9714 Add WiFi toggle prompts - framework 
am: 6c3032f16b

Change-Id: Ie89a9b91b8b1cd7158a743d8b5870d8f9d6f8adc
 2016-11-15 03:27:22 +00:00
TreeHugger Robot
9f078049cf Merge "Add WiFi toggle prompts - framework" into stage-aosp-master 2016-11-15 03:18:26 +00:00
Yifan Hong
41579ea4d4 Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods." am: 8cc1343724 
am: 2187dc5ca1

Change-Id: If0919864026c78fed76df1554235c2acca9f2750
 2016-11-15 03:12:43 +00:00
Andreas Gampe
da69216ac6 Preload2: Fix dependencies 
Also depend on and package tools-common.

Test: m
Test: preload-tool
Change-Id: I19a8844f87417f2292e50ffaaebb5fa24a2eca24
 2016-11-14 19:08:22 -08:00
Yifan Hong
2187dc5ca1 Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods." 
am: 8cc1343724

Change-Id: If003adc06673d8e6c6db6f8a5d858dcca7aed109
 2016-11-15 03:06:44 +00:00
Treehugger Robot
8cc1343724 Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods." 2016-11-15 02:59:52 +00:00
Svetoslav Ganov
6c3032f16b Add WiFi toggle prompts - framework 
If permission review is enabled toggling WiFi on or off
results in a user prompt to collect a consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.

bug:28715749

Original-Change-Id: I020601e208c0736005bcabc7b7b77b96eee45b03
Change-Id: I3fdc2b02abecaf3166614b0cb9fac3553cb7ab88
(cherry picked from commit d3663c04a721e0848dd3e9179c84ba585d91839d)
 2016-11-14 18:34:40 -08:00
Peter Qiu
28a3d44536 osu: remove calls to deprecated APIs 
The hidden APIs WifiManager#addPasspointManagmentObject and
WifiManager#addPasspointManagementObject will removed, so remove
all callsites.

The OSU app is still under developement and is not included
in any device builds.  However, it is being built by the Treehugger
for generic AOSP builds.

So fix it to allow the API removal CLs to be submitted.

Bug: 32509661
Test: None
Merged-In: Ic405695ee8edfd0c08b831834797f163fe445595
Change-Id: If418c64e69f1836575257b9d5b2f5c4373050a31
 2016-11-15 02:12:57 +00:00
Peter Qiu
1c3054ea87 wifi: remove unused hidden Hotspot 2.0 Release 1 API 
WifiManager#buildWifiConfig was used by the Hotspot 2.0 Release 1
app (WifiInstaller) for parsing Release 1 installation data into
a WifiConfiguration object.  WifiInstaller will be updated to use
the new framework API (android.net.wifi.hotspot2.ConfigBuilder)
instead. So this API is no longer needed.

Bug: 32509661
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: Iacee739a9ed12ea00b1b7457e22e790ef4a177da
 2016-11-14 13:23:01 -08:00
Peter Qiu
a38558b539 wifi: remove hidden unused Hotspot 2.0 Release 2 APIs 
These APIs are used for installing/modifying the PerProviderSubscription
Management Object tree in XML string representation and are used only by
the unreleased Hotspot 2.0 Release 2 app (OSU app).  The OSU app will be
updated to use the new APIs which uses Parcelable objects to represent
provider configuration.

Bug: 32509661
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: Iff6b6e4b95b76d48201eeeb47f441b7c94f359bb
 2016-11-14 13:23:01 -08:00
Sohani Rao
31264c994c Merge "Add WiFi toggle prompts - framework" am: 584b5cee49 -s ours 
am: 31082a0824  -s ours

Change-Id: Ib2d485f7c6904fc3890c08f34d52703b92d379b5
 2016-11-14 21:21:38 +00:00
Sohani Rao
31082a0824 Merge "Add WiFi toggle prompts - framework" 
am: 584b5cee49  -s ours

Change-Id: I9dd54beb08f771be886c03fa0f8a3335f574c47c
 2016-11-14 21:14:44 +00:00
Sohani Rao
584b5cee49 Merge "Add WiFi toggle prompts - framework" 2016-11-14 20:59:36 +00:00
Sohani Rao
b4663456d4 Merge "Permissions check for Wifi Display configuration" am: f5c32a411c 
am: 7342bb84cd

Change-Id: Iac379dace6fd8b01e5bb80a193f79c65ace1f9b9
 2016-11-14 19:44:46 +00:00
Sohani Rao
7342bb84cd Merge "Permissions check for Wifi Display configuration" 
am: f5c32a411c

Change-Id: I7a1c2d0f48728cd5e056076a2cf1499a7abb2438
 2016-11-14 19:33:31 +00:00