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

185193 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vinit Deshpande
2edd0ca707 am "am dd7d025b: am ca0db1a0: am eeb79d10: am 9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs" 
merged from goog/mirror-m-wireless-internal-release
e32c162 am dd7d025b: am ca0db1a0: am eeb79d10: am 9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs
 2015-03-15 13:44:16 -07:00
Vinit Deshpande
ad2c40eb01 am "Merge "Indicate local and remote RX/TX capabilities for VT." into m-wireless-dev" 
merged from goog/mirror-m-wireless-internal-release
74050f5 Merge "Indicate local and remote RX/TX capabilities for VT." into m-wireless-dev
 2015-03-15 13:44:15 -07:00
Vinit Deshpande
ea49ffc54a am "am 50a9b835: am 42ee70aa: am 24b4e572: am 0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs automerge: b0422a4" 
merged from goog/mirror-m-wireless-internal-release
52def6d am 50a9b835: am 42ee70aa: am 24b4e572: am 0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs automerge: b0422a4
 2015-03-15 13:44:14 -07:00
Vinit Deshpande
4e0a066fef am "am 8ab872db: am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs automerge: 709e9a8" 
merged from goog/mirror-m-wireless-internal-release
b55db05 am 8ab872db: am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs automerge: 709e9a8
 2015-03-15 13:44:13 -07:00
Vinit Deshpande
78f4a93988 am "am a493c489: am 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto" automerge: baf3451" 
merged from goog/mirror-m-wireless-internal-release
d9a99e0 am a493c489: am 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto" automerge: baf3451
 2015-03-15 13:44:12 -07:00
Vinit Deshpande
50be7a2a75 am "am 50a9b835: am 42ee70aa: am 24b4e572: am 0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs" 
merged from goog/mirror-m-wireless-internal-release
b0422a4 am 50a9b835: am 42ee70aa: am 24b4e572: am 0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs
 2015-03-15 13:44:11 -07:00
Vinit Deshpande
a137ccf446 am "am 8ab872db: am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs" 
merged from goog/mirror-m-wireless-internal-release
709e9a8 am 8ab872db: am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs
 2015-03-15 13:44:10 -07:00
Vinit Deshpande
167c1ae570 am "am a493c489: am 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"" 
merged from goog/mirror-m-wireless-internal-release
baf3451 am a493c489: am 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"
 2015-03-15 13:44:09 -07:00
Vinit Deshpande
02ce8d8f33 am "Helper methods for voicemail status provider." 
merged from goog/mirror-m-wireless-internal-release
8b97ee3 Helper methods for voicemail status provider.
 2015-03-15 13:44:07 -07:00
Vinit Deshpande
386348f037 am "Indicate local and remote RX/TX capabilities for VT." 
merged from goog/mirror-m-wireless-internal-release
5e9e8bb Indicate local and remote RX/TX capabilities for VT.
 2015-03-15 13:44:05 -07:00
Vinit Deshpande
0a05c955be am "Merge "Add strings for IMS Registration error notifications." into lmp-mr1-wfc-dev automerge: 8b438c8" 
merged from goog/mirror-m-wireless-internal-release
4a2ca9d Merge "Add strings for IMS Registration error notifications." into lmp-mr1-wfc-dev automerge: 8b438c8
 2015-03-15 13:44:04 -07:00
Vinit Deshpande
c6c88559b7 am "Merge "Add strings for IMS Registration error notifications." into lmp-mr1-wfc-dev" 
merged from goog/mirror-m-wireless-internal-release
8b438c8 Merge "Add strings for IMS Registration error notifications." into lmp-mr1-wfc-dev
 2015-03-15 13:44:03 -07:00
Vinit Deshpande
54f833af66 am "Add missing system-api.txt for RTT API changes" 
merged from goog/mirror-m-wireless-internal-release
93e314e Add missing system-api.txt for RTT API changes
 2015-03-15 13:44:01 -07:00
Vinit Deshpande
75fe762af4 am "am 464a2bc2: Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev automerge: 9462a93" 
merged from goog/mirror-m-wireless-internal-release
1123a3e am 464a2bc2: Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev automerge: 9462a93
 2015-03-15 13:44:00 -07:00
Vinit Deshpande
34dbb09965 am "am 464a2bc2: Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev" 
merged from goog/mirror-m-wireless-internal-release
9462a93 am 464a2bc2: Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev
 2015-03-15 13:43:59 -07:00
Vinit Deshpande
74a7f97d01 am "Few changes to make API check happy [DO NOT MERGE]" 
merged from goog/mirror-m-wireless-internal-release with -s ours
No changes were actually committed
 2015-03-15 13:43:58 -07:00
Vinit Deshpande
7c3176c505 am "am "add 2 side RTT support on scan"" 
merged from goog/mirror-m-wireless-internal-release
0019e53 am "add 2 side RTT support on scan"
 2015-03-15 13:43:57 -07:00
Vinit Deshpande
5a6141f9ca am "am "Merge "Do not provide 5GHz option for softap if there is no country code available" into m-wireless-wifi-dev"" 
merged from goog/mirror-m-wireless-internal-release
bc93466 am "Merge "Do not provide 5GHz option for softap if there is no country code available" into m-wireless-wifi-dev"
 2015-03-15 13:43:55 -07:00
Vinit Deshpande
08524b7f71 am "am "Merge "Passpoint API - Take 1" into m-wireless-wifi-dev"" 
merged from goog/mirror-m-wireless-internal-release
4300ac4 am "Merge "Passpoint API - Take 1" into m-wireless-wifi-dev"
 2015-03-15 13:43:53 -07:00
Vinit Deshpande
bc4a627b4d am "am "Passpoint API - Take 1"" 
merged from goog/mirror-m-wireless-internal-release
d2585f3 am "Passpoint API - Take 1"
 2015-03-15 13:43:52 -07:00
Vinit Deshpande
c72607beca am "am "Do not provide 5GHz option for softap if there is no country code available"" 
merged from goog/mirror-m-wireless-internal-release
e959443 am "Do not provide 5GHz option for softap if there is no country code available"
 2015-03-15 13:43:50 -07:00
Vinit Deshpande
8fe414d3fc am "am "Introduce onLost event on bssid hotlist [DO NOT MERGE]"" 
merged from goog/mirror-m-wireless-internal-release with -s ours
No changes were actually committed
 2015-03-15 13:43:50 -07:00
Vinit Deshpande
ba8c391027 am "am "get channel list from driver for SoftAP channel selection"" 
merged from goog/mirror-m-wireless-internal-release
3cb5e4d am "get channel list from driver for SoftAP channel selection"
 2015-03-15 13:43:48 -07:00
Vinit Deshpande
2130a16b32 am "am "Revert "Initial Passpoint code.""" 
merged from goog/mirror-m-wireless-internal-release
76f9ace am "Revert "Initial Passpoint code.""
 2015-03-15 13:43:47 -07:00
Vinit Deshpande
a32db201a8 am "am "Initial Passpoint code."" 
merged from goog/mirror-m-wireless-internal-release
29267b6 am "Initial Passpoint code."
 2015-03-15 13:43:45 -07:00
Vinit Deshpande
5865b6aceb am "am "Merge "set softAP on a specified band, including both 2.4 and 5 GHz band" into m-wireless-wifi-dev"" 
merged from goog/mirror-m-wireless-internal-release
f0bfa91 am "Merge "set softAP on a specified band, including both 2.4 and 5 GHz band" into m-wireless-wifi-dev"
 2015-03-15 13:43:43 -07:00
Vinit Deshpande
535fb0189a am "am "set softAP on a specified band, including both 2.4 and 5 GHz band"" 
merged from goog/mirror-m-wireless-internal-release
b4499af am "set softAP on a specified band, including both 2.4 and 5 GHz band"
 2015-03-15 13:43:42 -07:00
Vinit Deshpande
bf44807438 am "am "Bring in passpoint code [DO NOT MERGE]"" 
merged from goog/mirror-m-wireless-internal-release with -s ours
No changes were actually committed
 2015-03-15 13:43:41 -07:00
Vinit Deshpande
65c1c2ceed am "am "New Additions to WifiScanner APIs [DO NOT MERGE]"" 
merged from goog/mirror-m-wireless-internal-release with -s ours
No changes were actually committed
 2015-03-15 13:43:40 -07:00
Vinit Deshpande
1949b805fa am "Add strings for IMS Registration error notifications." 
merged from goog/mirror-m-wireless-internal-release
36d96e0 Add strings for IMS Registration error notifications.
 2015-03-15 13:43:38 -07:00
Vinit Deshpande
a77f84f341 am "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" 
merged from goog/mirror-m-wireless-internal-release
81e1b71 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
 2015-03-15 13:43:37 -07:00
Vinit Deshpande
5664f6e05f am "am 5a604b35: am 00e3efb5: am f51020ea: am 6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs" 
merged from goog/mirror-m-wireless-internal-release
011f5ce am 5a604b35: am 00e3efb5: am f51020ea: am 6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs
 2015-03-15 13:43:36 -07:00
Vinit Deshpande
8e212d6aae am "am ea9308cf: am a9639fe6: am 2fcc438f: am 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs automerge: 142e90e" 
merged from goog/mirror-m-wireless-internal-release
e6dc1a9 am ea9308cf: am a9639fe6: am 2fcc438f: am 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs automerge: 142e90e
 2015-03-15 13:43:35 -07:00
Vinit Deshpande
13828e71d7 am "Update documentation of IImsConfig interface. automerge: 796d60b" 
merged from goog/mirror-m-wireless-internal-release
b565b79 Update documentation of IImsConfig interface. automerge: 796d60b
 2015-03-15 13:43:34 -07:00
Vinit Deshpande
549012c28b am "am ea9308cf: am a9639fe6: am 2fcc438f: am 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs" 
merged from goog/mirror-m-wireless-internal-release
142e90e am ea9308cf: am a9639fe6: am 2fcc438f: am 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs
 2015-03-15 13:43:33 -07:00
Vinit Deshpande
a7d8aa7729 am "Update documentation of IImsConfig interface." 
merged from goog/mirror-m-wireless-internal-release
796d60b Update documentation of IImsConfig interface.
 2015-03-15 13:43:32 -07:00
Vinit Deshpande
5b2e7313ea am "Merge "IMS: Support for IMS Registration error codes" into lmp-mr1-wfc-dev automerge: 2f23212" 
merged from goog/mirror-m-wireless-internal-release
6c70b49 Merge "IMS: Support for IMS Registration error codes" into lmp-mr1-wfc-dev automerge: 2f23212
 2015-03-15 13:43:30 -07:00
Vinit Deshpande
303c90e146 am "Merge "IMS: Support for IMS Registration error codes" into lmp-mr1-wfc-dev" 
merged from goog/mirror-m-wireless-internal-release
2f23212 Merge "IMS: Support for IMS Registration error codes" into lmp-mr1-wfc-dev
 2015-03-15 13:43:29 -07:00
Vinit Deshpande
7dab6b29eb am "IMS: Support for IMS Registration error codes" 
merged from goog/mirror-m-wireless-internal-release
b54d218 IMS: Support for IMS Registration error codes
 2015-03-15 13:43:28 -07:00
Vinit Deshpande
766686f336 am "am 39d47c7c: am a2d342e3: am beed9332: am 0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs automerge: df5651d" 
merged from goog/mirror-m-wireless-internal-release
e4112b7 am 39d47c7c: am a2d342e3: am beed9332: am 0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs automerge: df5651d
 2015-03-15 13:43:27 -07:00
Vinit Deshpande
07e1cf216a am "am 39d47c7c: am a2d342e3: am beed9332: am 0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs" 
merged from goog/mirror-m-wireless-internal-release
df5651d am 39d47c7c: am a2d342e3: am beed9332: am 0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs
 2015-03-15 13:43:26 -07:00
Vinit Deshpande
4ccdf42363 am "am 4c0b2345: am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos automerge: 32ee913" 
merged from goog/mirror-m-wireless-internal-release
2f4f522 am 4c0b2345: am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos automerge: 32ee913
 2015-03-15 13:43:25 -07:00
Vinit Deshpande
95d4320ea1 am "am 4c0b2345: am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos" 
merged from goog/mirror-m-wireless-internal-release
32ee913 am 4c0b2345: am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos
 2015-03-15 13:43:24 -07:00
Vinit Deshpande
655ef766b2 am "am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev automerge: 701d816" 
merged from goog/mirror-m-wireless-internal-release
2a23382 am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev automerge: 701d816
 2015-03-15 13:43:23 -07:00
Vinit Deshpande
a8b8a3a16b am "am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev" 
merged from goog/mirror-m-wireless-internal-release
701d816 am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev
 2015-03-15 13:43:21 -07:00
Vinit Deshpande
4496c88f0e am "Merge "Hide calllog entries for unregistered phone accounts" into m-wireless-dev" 
merged from goog/mirror-m-wireless-internal-release
ddbf13d Merge "Hide calllog entries for unregistered phone accounts" into m-wireless-dev
 2015-03-15 13:43:20 -07:00
Vinit Deshpande
2270862d10 am "am 636a39ba: am e95fa264: am e17b0a14: am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs automerge: ac35ad3" 
merged from goog/mirror-m-wireless-internal-release
5bd0d33 am 636a39ba: am e95fa264: am e17b0a14: am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs automerge: ac35ad3
 2015-03-15 13:43:19 -07:00
Vinit Deshpande
a4985a7952 am "Hide calllog entries for unregistered phone accounts" 
merged from goog/mirror-m-wireless-internal-release
2d2bc16 Hide calllog entries for unregistered phone accounts

Change-Id: I39b60b86fca9c1b74d750ab251cc26b3ce5f5650
 2015-03-15 13:43:11 -07:00
Vinit Deshpande
a166fa09c8 am "am 636a39ba: am e95fa264: am e17b0a14: am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs" 
merged from goog/mirror-m-wireless-internal-release
ac35ad3 am 636a39ba: am e95fa264: am e17b0a14: am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs
 2015-03-15 13:42:51 -07:00
Vinit Deshpande
9b2eb2b0f7 am "am bc669e3f: am dad1cbeb: am 9f485e97: am 4aba69a8: docs: sdk tools date fix automerge: 06a22af" 
merged from goog/mirror-m-wireless-internal-release
9674014 am bc669e3f: am dad1cbeb: am 9f485e97: am 4aba69a8: docs: sdk tools date fix automerge: 06a22af
 2015-03-15 13:42:50 -07:00