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

160740 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vinit Deshpande
93e314e82d Add missing system-api.txt for RTT API changes 
Change-Id: I85bd48daf3da16ab3b14dc55083fba78372a6cc5
 2015-03-10 11:41:45 -07:00
Rich Slogar
1123a3eb52 am 464a2bc2: Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev 
automerge: 9462a93

* commit '9462a93b053d11e77a3024951ce2c9b36cffb18d':
  docs: build tools revision 22.0.0:
 2015-03-10 03:22:26 +00:00
Rich Slogar
9462a93b05 am 464a2bc2: Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev 
* commit '464a2bc261ac3b3ad817e3d5cc7fa8f3dae0a6c3':
  docs: build tools revision 22.0.0:
 2015-03-10 03:08:58 +00:00
Vinit Deshpande
046ac5e6f7 Few changes to make API check happy [DO NOT MERGE] 
These changes are made to make the API check in mwd-staging
happy. It doesn't look like they are needed in master branch;
so marking them as DO NOT MERGE.

Change-Id: I45363165b6a8ffe896cf9a31c0b3cb410aa69cba
 2015-03-09 19:02:09 -07:00
Vinit Deshpande
0019e53e11 am "add 2 side RTT support on scan" 
merged from partner/m-wireless-wifi-dev
6e58424 add 2 side RTT support on scan
 2015-03-09 19:01:39 -07:00
Vinit Deshpande
bc93466e5a am "Merge "Do not provide 5GHz option for softap if there is no country code available" into m-wireless-wifi-dev" 
merged from partner/m-wireless-wifi-dev
a357b5a Merge "Do not provide 5GHz option for softap if there is no country code available" into m-wireless-wifi-dev
 2015-03-09 19:01:39 -07:00
Vinit Deshpande
4300ac49e3 am "Merge "Passpoint API - Take 1" into m-wireless-wifi-dev" 
merged from partner/m-wireless-wifi-dev
c4423a5 Merge "Passpoint API - Take 1" into m-wireless-wifi-dev
 2015-03-09 19:01:38 -07:00
Vinit Deshpande
d2585f3050 am "Passpoint API - Take 1" 
merged from partner/m-wireless-wifi-dev
b21d248 Passpoint API - Take 1
 2015-03-09 19:01:37 -07:00
Vinit Deshpande
e95944300e am "Do not provide 5GHz option for softap if there is no country code available" 
merged from partner/m-wireless-wifi-dev
b938c0e Do not provide 5GHz option for softap if there is no country code available
 2015-03-09 19:01:37 -07:00
Vinit Deshpande
14a2008f63 am "Introduce onLost event on bssid hotlist [DO NOT MERGE]" 
merged from partner/m-wireless-wifi-dev
ab325cb Introduce onLost event on bssid hotlist [DO NOT MERGE]
 2015-03-09 19:01:36 -07:00
Vinit Deshpande
3cb5e4d72f am "get channel list from driver for SoftAP channel selection" 
merged from partner/m-wireless-wifi-dev
18ae1d2 get channel list from driver for SoftAP channel selection
 2015-03-09 19:01:35 -07:00
Vinit Deshpande
76f9aceecf am "Revert "Initial Passpoint code."" 
merged from partner/m-wireless-wifi-dev
5d7768f Revert "Initial Passpoint code."
 2015-03-09 19:01:34 -07:00
Vinit Deshpande
29267b6dd6 am "Initial Passpoint code." 
merged from partner/m-wireless-wifi-dev
2eba02a Initial Passpoint code.
 2015-03-09 19:01:33 -07:00
Vinit Deshpande
f0bfa91103 am "Merge "set softAP on a specified band, including both 2.4 and 5 GHz band" into m-wireless-wifi-dev" 
merged from partner/m-wireless-wifi-dev
08cbd3e Merge "set softAP on a specified band, including both 2.4 and 5 GHz band" into m-wireless-wifi-dev
 2015-03-09 19:01:32 -07:00
Vinit Deshpande
b4499afde5 am "set softAP on a specified band, including both 2.4 and 5 GHz band" 
merged from partner/m-wireless-wifi-dev
a0be0fb set softAP on a specified band, including both 2.4 and 5 GHz band
 2015-03-09 19:01:31 -07:00
Vinit Deshpande
1aa4dcee03 am "Bring in passpoint code [DO NOT MERGE]" 
merged from partner/m-wireless-wifi-dev
7dd2f6b Bring in passpoint code [DO NOT MERGE]
 2015-03-09 19:01:31 -07:00
Vinit Deshpande
472cca08eb am "New Additions to WifiScanner APIs [DO NOT MERGE]" 
merged from partner/m-wireless-wifi-dev
f45acfe New Additions to WifiScanner APIs [DO NOT MERGE]
 2015-03-09 19:01:29 -07:00
Rich Slogar
464a2bc261 Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev 2015-03-09 23:42:48 +00:00
Rich Slogar
81e1b71320 am 5a604b35: am 00e3efb5: am f51020ea: am 6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs 
automerge: 011f5ce

* commit '011f5ceea0d57f9452cdbe42f7a309d28bbd6d59':
  docs: android plugin for gradle release 1.1.3 release notes
 2015-03-09 20:04:34 +00:00
Rich Slogar
011f5ceea0 am 5a604b35: am 00e3efb5: am f51020ea: am 6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs 
* commit '5a604b359cd487d4a01a397e49117d22848e6809':
  docs: android plugin for gradle release 1.1.3 release notes
 2015-03-09 19:54:48 +00:00
Rich Slogar
5a604b359c am 00e3efb5: am f51020ea: am 6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs 
* commit '00e3efb549274ac381c95e359611ce7dcc9542cc':
  docs: android plugin for gradle release 1.1.3 release notes
 2015-03-09 19:47:18 +00:00
Rich Slogar
00e3efb549 am f51020ea: am 6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs 
* commit 'f51020eaaaff9f54cee1ba91ab35d0212ddb0f54':
  docs: android plugin for gradle release 1.1.3 release notes
 2015-03-09 19:40:48 +00:00
Rich Slogar
f51020eaaa am 6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs 
* commit '6e1cbe43957b18f471f82682b5df999578230230':
  docs: android plugin for gradle release 1.1.3 release notes
 2015-03-09 19:34:32 +00:00
Rich Slogar
6e1cbe4395 Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs 2015-03-09 19:29:37 +00:00
Rich Slogar
24387bf7ab docs: build tools revision 22.0.0: 
Change-Id: Idcc00e2fb0f30c54f28ad0c12c6fb014df681e76
 2015-03-09 10:31:02 -07:00
Luan Nguyen
e6dc1a9343 am ea9308cf: am a9639fe6: am 2fcc438f: am 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs 
automerge: 142e90e

* commit '142e90e5d6fcea4265fbf945a6fc439a4b2efef8':
  docs: Add new partners to Wear index page
 2015-03-09 17:24:42 +00:00
Etan Cohen
b565b79d73 Update documentation of IImsConfig interface. 
automerge: 796d60b

* commit '796d60b12e0756db4689632d0985f7a5ed7a47d3':
  Update documentation of IImsConfig interface.
 2015-03-09 17:24:33 +00:00
Luan Nguyen
142e90e5d6 am ea9308cf: am a9639fe6: am 2fcc438f: am 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs 
* commit 'ea9308cf6b95858ef4f16222ebb8809621b801ae':
  docs: Add new partners to Wear index page
 2015-03-09 17:17:04 +00:00
Etan Cohen
796d60b12e Update documentation of IImsConfig interface. 
Change-Id: Id176c131e0192a2ebb4dd73e902c2a893feebcdc
 2015-03-09 10:13:40 -07:00
Luan Nguyen
ea9308cf6b am a9639fe6: am 2fcc438f: am 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs 
* commit 'a9639fe619591888fcc97475de15a55017dd1ff7':
  docs: Add new partners to Wear index page
 2015-03-09 15:05:44 +00:00
Luan Nguyen
a9639fe619 am 2fcc438f: am 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs 
* commit '2fcc438f765789e1786cdfe612f61b034ad7344b':
  docs: Add new partners to Wear index page
 2015-03-09 14:59:12 +00:00
Luan Nguyen
2fcc438f76 am 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs 
* commit '6a96a77814a89836ba0a85335479c6b3ea9aec33':
  docs: Add new partners to Wear index page
 2015-03-09 14:52:45 +00:00
Luan Nguyen
6a96a77814 Merge "docs: Add new partners to Wear index page" into lmp-docs 2015-03-09 14:47:33 +00:00
Pavel Zhamaitsiak
6c70b49715 Merge "IMS: Support for IMS Registration error codes" into lmp-mr1-wfc-dev 
automerge: 2f23212

* commit '2f23212ce5e049e46e70ace1a997ca85746d6065':
  IMS: Support for IMS Registration  error codes
 2015-03-07 00:42:57 +00:00
Pavel Zhamaitsiak
2f23212ce5 Merge "IMS: Support for IMS Registration error codes" into lmp-mr1-wfc-dev 2015-03-07 00:32:36 +00:00
Rich Slogar
d5322338d8 docs: android plugin for gradle release 1.1.3 release notes 
Change-Id: If7ee333e83e0be60c864021e068f024694eb3dd1
 2015-03-06 16:17:56 -08:00
Rekha Kumar
b54d218d8b IMS: Support for IMS Registration error codes 
- Add support for propagation of IMS Registration errors
- Add reason type - operator specific
- Add call drop reason type and error code CD-04 that specifies there was no
  qualified LTE network to handover to from a wifi call

Change-Id: Ib9c93dfafe8d8fbdece3a5daf6fd13ef0c16f158
 2015-03-06 16:08:34 -08:00
Eric Gilmore
e4112b7cc5 am 39d47c7c: am a2d342e3: am beed9332: am 0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs 
automerge: df5651d

* commit 'df5651dce73436444a15f0c824ee7e76393e0d9e':
  Reworking geofencing training to new API and sample.
 2015-03-06 19:50:49 +00:00
Eric Gilmore
df5651dce7 am 39d47c7c: am a2d342e3: am beed9332: am 0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs 
* commit '39d47c7c709cd2417f8a0a7849ed6da8eb83caa3':
  Reworking geofencing training to new API and sample.
 2015-03-06 19:40:07 +00:00
Eric Gilmore
39d47c7c70 am a2d342e3: am beed9332: am 0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs 
* commit 'a2d342e374b6c3152695ad0761a2bdb96be2d8c4':
  Reworking geofencing training to new API and sample.
 2015-03-06 19:33:51 +00:00
Eric Gilmore
a2d342e374 am beed9332: am 0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs 
* commit 'beed93320633a0c460952eaa91a61a1d186e390a':
  Reworking geofencing training to new API and sample.
 2015-03-06 19:27:14 +00:00
Eric Gilmore
beed933206 am 0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs 
* commit '0bceaacf4221a5b302d12fc085744bb54cbbdd6e':
  Reworking geofencing training to new API and sample.
 2015-03-06 19:20:45 +00:00
Eric Gilmore
0bceaacf42 Merge "Reworking geofencing training to new API and sample." into lmp-docs 2015-03-06 19:14:28 +00:00
Eric Gilmore
a0e3eb7ba2 Reworking geofencing training to new API and sample. 
Change-Id: Ibc9e2561cd93e73eab87a78f4aabe64ae9c8a0b3
 2015-03-06 10:50:59 -08:00
Glenn Kasten
2f4f5221a9 am 4c0b2345: am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos 
automerge: 32ee913

* commit '32ee913c953fbd3c9c3359fbf031f412794e3178':
  Fix USB typos
 2015-03-06 16:56:31 +00:00
Glenn Kasten
32ee913c95 am 4c0b2345: am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos 
* commit '4c0b23453c35581bdcc5738d047d90c2b56cb3ee':
  Fix USB typos
 2015-03-06 16:45:14 +00:00
Glenn Kasten
4c0b23453c am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos 
* commit '8f9ae2323e747dfbc09b48c6e29edcffaca4d0c7':
  Fix USB typos
 2015-03-06 16:38:48 +00:00
Glenn Kasten
8f9ae2323e am 36d008c5: am 5afdc97f: Fix USB typos 
* commit '36d008c5aea036e4c2e62dd8d5453ada72dcdea0':
  Fix USB typos
 2015-03-06 16:32:39 +00:00
Glenn Kasten
36d008c5ae am 5afdc97f: Fix USB typos 
* commit '5afdc97f2e41845e7ddf512814771d4cdf134171':
  Fix USB typos
 2015-03-06 16:25:58 +00:00
Glenn Kasten
5afdc97f2e Fix USB typos 
Change-Id: Iefa610a81e9155dcfc687c514611bb7dbba5d7f9
(cherry picked from commit 9e86f6139b62dbc87b7ea97cedf847c847657829)
 2015-03-06 16:15:15 +00:00