OSDN Git Service
Nancy Chen [Thu, 5 Mar 2015 05:02:27 +0000 (21:02 -0800)]
Helper methods for voicemail status provider.
Added method to make it easier to insert into the voicemail status
table. Also takes in a phone account for future multi-SIM support.
Remove VvmSyncService class in favor of moving most of the code to
OmtpVvmSyncService.
Bug:
19236241
Change-Id: I5d9def276fbdbc6f825fb35e9fa31bfc3cead1ba
Pavel Zhamaitsiak [Tue, 10 Mar 2015 19:34:02 +0000 (19:34 +0000)]
Merge "Add strings for IMS Registration error notifications." into lmp-mr1-wfc-dev
automerge:
8b438c8
* commit '
8b438c8c1abc3e5e5cce2c9ee22f64c9a5a30290':
Add strings for IMS Registration error notifications.
Pavel Zhamaitsiak [Tue, 10 Mar 2015 19:22:16 +0000 (19:22 +0000)]
Merge "Add strings for IMS Registration error notifications." into lmp-mr1-wfc-dev
Vinit Deshpande [Tue, 10 Mar 2015 18:41:45 +0000 (11:41 -0700)]
Add missing system-api.txt for RTT API changes
Change-Id: I85bd48daf3da16ab3b14dc55083fba78372a6cc5
Rich Slogar [Tue, 10 Mar 2015 03:22:26 +0000 (03:22 +0000)]
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:
Rich Slogar [Tue, 10 Mar 2015 03:08:58 +0000 (03:08 +0000)]
am
464a2bc2: Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev
* commit '
464a2bc261ac3b3ad817e3d5cc7fa8f3dae0a6c3':
docs: build tools revision 22.0.0:
Vinit Deshpande [Sat, 7 Mar 2015 00:52:00 +0000 (16:52 -0800)]
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
Vinit Deshpande [Tue, 10 Mar 2015 02:01:39 +0000 (19:01 -0700)]
am "add 2 side RTT support on scan"
merged from partner/m-wireless-wifi-dev
6e58424 add 2 side RTT support on scan
Vinit Deshpande [Tue, 10 Mar 2015 02:01:39 +0000 (19:01 -0700)]
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
Vinit Deshpande [Tue, 10 Mar 2015 02:01:38 +0000 (19:01 -0700)]
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
Vinit Deshpande [Tue, 10 Mar 2015 02:01:37 +0000 (19:01 -0700)]
am "Passpoint API - Take 1"
merged from partner/m-wireless-wifi-dev
b21d248 Passpoint API - Take 1
Vinit Deshpande [Tue, 10 Mar 2015 02:01:37 +0000 (19:01 -0700)]
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
Vinit Deshpande [Tue, 10 Mar 2015 02:01:36 +0000 (19:01 -0700)]
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]
Vinit Deshpande [Tue, 10 Mar 2015 02:01:35 +0000 (19:01 -0700)]
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
Vinit Deshpande [Tue, 10 Mar 2015 02:01:34 +0000 (19:01 -0700)]
am "Revert "Initial Passpoint code.""
merged from partner/m-wireless-wifi-dev
5d7768f Revert "Initial Passpoint code."
Vinit Deshpande [Tue, 10 Mar 2015 02:01:33 +0000 (19:01 -0700)]
am "Initial Passpoint code."
merged from partner/m-wireless-wifi-dev
2eba02a Initial Passpoint code.
Vinit Deshpande [Tue, 10 Mar 2015 02:01:32 +0000 (19:01 -0700)]
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
Vinit Deshpande [Tue, 10 Mar 2015 02:01:31 +0000 (19:01 -0700)]
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
Vinit Deshpande [Tue, 10 Mar 2015 02:01:31 +0000 (19:01 -0700)]
am "Bring in passpoint code [DO NOT MERGE]"
merged from partner/m-wireless-wifi-dev
7dd2f6b Bring in passpoint code [DO NOT MERGE]
Vinit Deshpande [Tue, 10 Mar 2015 02:01:29 +0000 (19:01 -0700)]
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]
Rich Slogar [Mon, 9 Mar 2015 23:42:38 +0000 (23:42 +0000)]
Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev
Pavel Zhamaitsiak [Sat, 7 Mar 2015 00:09:18 +0000 (16:09 -0800)]
Add strings for IMS Registration error notifications.
Change-Id: I14808e1dbbd14b5124be7303d586638b9e210269
Rich Slogar [Mon, 9 Mar 2015 20:04:34 +0000 (20:04 +0000)]
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
Rich Slogar [Mon, 9 Mar 2015 19:54:48 +0000 (19:54 +0000)]
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
Rich Slogar [Mon, 9 Mar 2015 19:47:18 +0000 (19:47 +0000)]
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
Rich Slogar [Mon, 9 Mar 2015 19:40:48 +0000 (19:40 +0000)]
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
Rich Slogar [Mon, 9 Mar 2015 19:34:32 +0000 (19:34 +0000)]
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
Rich Slogar [Mon, 9 Mar 2015 19:29:36 +0000 (19:29 +0000)]
Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs
Rich Slogar [Tue, 3 Mar 2015 02:11:33 +0000 (18:11 -0800)]
docs: build tools revision 22.0.0:
Change-Id: Idcc00e2fb0f30c54f28ad0c12c6fb014df681e76
Luan Nguyen [Mon, 9 Mar 2015 17:24:42 +0000 (17:24 +0000)]
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
Etan Cohen [Mon, 9 Mar 2015 17:24:33 +0000 (17:24 +0000)]
Update documentation of IImsConfig interface.
automerge:
796d60b
* commit '
796d60b12e0756db4689632d0985f7a5ed7a47d3':
Update documentation of IImsConfig interface.
Luan Nguyen [Mon, 9 Mar 2015 17:17:04 +0000 (17:17 +0000)]
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
Etan Cohen [Mon, 9 Mar 2015 17:08:49 +0000 (10:08 -0700)]
Update documentation of IImsConfig interface.
Change-Id: Id176c131e0192a2ebb4dd73e902c2a893feebcdc
Luan Nguyen [Mon, 9 Mar 2015 15:05:44 +0000 (15:05 +0000)]
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
Luan Nguyen [Mon, 9 Mar 2015 14:59:12 +0000 (14:59 +0000)]
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
Luan Nguyen [Mon, 9 Mar 2015 14:52:45 +0000 (14:52 +0000)]
am
6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs
* commit '
6a96a77814a89836ba0a85335479c6b3ea9aec33':
docs: Add new partners to Wear index page
Luan Nguyen [Mon, 9 Mar 2015 14:47:31 +0000 (14:47 +0000)]
Merge "docs: Add new partners to Wear index page" into lmp-docs
Pavel Zhamaitsiak [Sat, 7 Mar 2015 00:42:57 +0000 (00:42 +0000)]
Merge "IMS: Support for IMS Registration error codes" into lmp-mr1-wfc-dev
automerge:
2f23212
* commit '
2f23212ce5e049e46e70ace1a997ca85746d6065':
IMS: Support for IMS Registration error codes
Pavel Zhamaitsiak [Sat, 7 Mar 2015 00:32:35 +0000 (00:32 +0000)]
Merge "IMS: Support for IMS Registration error codes" into lmp-mr1-wfc-dev
Rich Slogar [Sat, 7 Mar 2015 00:12:26 +0000 (16:12 -0800)]
docs: android plugin for gradle release 1.1.3 release notes
Change-Id: If7ee333e83e0be60c864021e068f024694eb3dd1
Rekha Kumar [Tue, 24 Feb 2015 19:45:36 +0000 (11:45 -0800)]
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
Eric Gilmore [Fri, 6 Mar 2015 19:50:49 +0000 (19:50 +0000)]
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.
Eric Gilmore [Fri, 6 Mar 2015 19:40:07 +0000 (19:40 +0000)]
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.
Eric Gilmore [Fri, 6 Mar 2015 19:33:51 +0000 (19:33 +0000)]
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.
Eric Gilmore [Fri, 6 Mar 2015 19:27:14 +0000 (19:27 +0000)]
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.
Eric Gilmore [Fri, 6 Mar 2015 19:20:45 +0000 (19:20 +0000)]
am
0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs
* commit '
0bceaacf4221a5b302d12fc085744bb54cbbdd6e':
Reworking geofencing training to new API and sample.
Eric Gilmore [Fri, 6 Mar 2015 19:14:27 +0000 (19:14 +0000)]
Merge "Reworking geofencing training to new API and sample." into lmp-docs
Eric Gilmore [Fri, 30 Jan 2015 00:21:43 +0000 (16:21 -0800)]
Reworking geofencing training to new API and sample.
Change-Id: Ibc9e2561cd93e73eab87a78f4aabe64ae9c8a0b3
Glenn Kasten [Fri, 6 Mar 2015 16:56:31 +0000 (16:56 +0000)]
Glenn Kasten [Fri, 6 Mar 2015 16:45:14 +0000 (16:45 +0000)]
Glenn Kasten [Fri, 6 Mar 2015 16:38:48 +0000 (16:38 +0000)]
Glenn Kasten [Fri, 6 Mar 2015 16:32:39 +0000 (16:32 +0000)]
Glenn Kasten [Fri, 6 Mar 2015 16:25:58 +0000 (16:25 +0000)]
Glenn Kasten [Thu, 31 Jul 2014 18:11:11 +0000 (11:11 -0700)]
Fix USB typos
Change-Id: Iefa610a81e9155dcfc687c514611bb7dbba5d7f9
(cherry picked from commit
9e86f6139b62dbc87b7ea97cedf847c847657829)
Dan Sandler [Fri, 6 Mar 2015 00:20:48 +0000 (00:20 +0000)]
am
3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev
automerge:
701d816
* commit '
701d8166550e1ddfd62bd82b7ea0f6a91c75a699':
Avoid crashing on startup when policy forbids lockscreen camera.
Dan Sandler [Fri, 6 Mar 2015 00:10:10 +0000 (00:10 +0000)]
am
3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev
* commit '
3581f4c91a77ecb9313f51a2d07ed88ff61d9299':
Avoid crashing on startup when policy forbids lockscreen camera.
Dan Sandler [Fri, 6 Mar 2015 00:03:34 +0000 (00:03 +0000)]
Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev
Nancy Chen [Thu, 5 Mar 2015 23:31:06 +0000 (23:31 +0000)]
Merge "Hide calllog entries for unregistered phone accounts" into m-wireless-dev
Eric Gilmore [Thu, 5 Mar 2015 23:22:58 +0000 (23:22 +0000)]
am
636a39ba: am
e95fa264: am
e17b0a14: am
87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs
automerge:
ac35ad3
* commit '
ac35ad36696bb129aa0de9c9926303ec8b941c9b':
Re-fixing link, and removing trailing white space.
Santos Cordon [Fri, 27 Feb 2015 23:22:07 +0000 (15:22 -0800)]
Hide calllog entries for unregistered phone accounts
Cherry-picked from master
Change-Id: If1f873dd41c973442fa7a24020e56d13b7b5ad2c
Eric Gilmore [Thu, 5 Mar 2015 23:12:21 +0000 (23:12 +0000)]
am
636a39ba: am
e95fa264: am
e17b0a14: am
87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs
* commit '
636a39babbda97743b33511b3dd2addafc8c2847':
Re-fixing link, and removing trailing white space.
Eric Gilmore [Thu, 5 Mar 2015 23:04:27 +0000 (23:04 +0000)]
am
e95fa264: am
e17b0a14: am
87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs
* commit '
e95fa2649b62a3fbccd096b43925a17c6ff03228':
Re-fixing link, and removing trailing white space.
Eric Gilmore [Thu, 5 Mar 2015 22:50:16 +0000 (22:50 +0000)]
am
e17b0a14: am
87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs
* commit '
e17b0a14ccc427bff386517537fcf23e00a087d4':
Re-fixing link, and removing trailing white space.
Eric Gilmore [Thu, 5 Mar 2015 22:34:58 +0000 (22:34 +0000)]
am
87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs
* commit '
87499b275bc7a8d4a12a3134646769a5c6c34829':
Re-fixing link, and removing trailing white space.
Eric Gilmore [Thu, 5 Mar 2015 22:00:20 +0000 (22:00 +0000)]
Merge "Re-fixing link, and removing trailing white space." into lmp-docs
Eric Gilmore [Thu, 5 Mar 2015 21:39:21 +0000 (13:39 -0800)]
Re-fixing link, and removing trailing white space.
Change-Id: Ic6cef9862424d5581cf0ad5b8366c7033a9fdd93
Rich Slogar [Thu, 5 Mar 2015 20:03:59 +0000 (20:03 +0000)]
am
bc669e3f: am
dad1cbeb: am
9f485e97: am
4aba69a8: docs: sdk tools date fix
automerge:
06a22af
* commit '
06a22afb7ed3daab3af247bfa3552fe90233b5c6':
docs: sdk tools date fix
Rich Slogar [Thu, 5 Mar 2015 19:53:00 +0000 (19:53 +0000)]
am
bc669e3f: am
dad1cbeb: am
9f485e97: am
4aba69a8: docs: sdk tools date fix
* commit '
bc669e3f555519f641102b759a04a01ac5c10cad':
docs: sdk tools date fix
Rich Slogar [Thu, 5 Mar 2015 19:46:12 +0000 (19:46 +0000)]
am
dad1cbeb: am
9f485e97: am
4aba69a8: docs: sdk tools date fix
* commit '
dad1cbebfabf421efc90d366d9c4fd67becf930f':
docs: sdk tools date fix
Rich Slogar [Thu, 5 Mar 2015 19:39:47 +0000 (19:39 +0000)]
am
9f485e97: am
4aba69a8: docs: sdk tools date fix
* commit '
9f485e971e06dad399dd70712787f4c30da9515e':
docs: sdk tools date fix
Rich Slogar [Thu, 5 Mar 2015 19:33:56 +0000 (19:33 +0000)]
am
4aba69a8: docs: sdk tools date fix
* commit '
4aba69a8a7f58541ce76429252dd0c9650b40f35':
docs: sdk tools date fix
Rich Slogar [Thu, 5 Mar 2015 19:24:45 +0000 (11:24 -0800)]
docs: sdk tools date fix
Change-Id: Ieb0a5193a5bbf7efd1e5852be4b0db421d08db14
Lorenzo Colitti [Thu, 5 Mar 2015 06:53:52 +0000 (06:53 +0000)]
Merge "Enable Ethernet if the device has FEATURE_USB_HOST." into m-wireless-dev
smain@google.com [Thu, 5 Mar 2015 06:31:21 +0000 (06:31 +0000)]
am
8b2be54a: am
182059f8: am
ca10a435: am
f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
automerge:
ee314cf
* commit '
ee314cfea558310a072658e2a12e951a365eaa9c':
add tags for wakelock and other API names
smain@google.com [Thu, 5 Mar 2015 06:21:05 +0000 (06:21 +0000)]
am
8b2be54a: am
182059f8: am
ca10a435: am
f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
* commit '
8b2be54a629e4567152d8b0e6c81332632b0b877':
add tags for wakelock and other API names
smain@google.com [Thu, 5 Mar 2015 06:10:54 +0000 (06:10 +0000)]
am
182059f8: am
ca10a435: am
f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
* commit '
182059f875bedc778a3ce9710a4f634197d1e959':
add tags for wakelock and other API names
Lorenzo Colitti [Tue, 25 Nov 2014 12:52:12 +0000 (21:52 +0900)]
Enable Ethernet if the device has FEATURE_USB_HOST.
Any device that supports USB OTG is capable of running Ethernet
via a USB OTG cable and Ethernet to USB adapter.
Currently, we only start the Ethernet system service if the
device has FEATURE_ETHERNET, but this requires that every device
explicitly declare FEATURE_ETHERNET, which causes bugs like
http://b/
18515146 , where the L OTA broke Ethernet on nakasi.
Therefore, start the Ethernet service on all devices that have
FEATURE_USB_HOST.
Bug:
18515146
Change-Id: I3b4e85d1ad8e1aea9baa046a27f5b4dd68c42028
smain@google.com [Thu, 5 Mar 2015 01:12:15 +0000 (01:12 +0000)]
am
ca10a435: am
f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
* commit '
ca10a4352f07652d82da59f6c1630e8607d82dda':
add tags for wakelock and other API names
Eric Gilmore [Thu, 5 Mar 2015 01:04:45 +0000 (01:04 +0000)]
am
498691d2: am
62777b18: am
5c30adfd: am
22d1c1ce: Merge "Fixing broken link per b/
19503824." into lmp-docs
automerge:
5890742
* commit '
5890742da7e1a31b6e696dd3218c8b48cccf8473':
Fixing broken link per b/
19503824.
smain@google.com [Thu, 5 Mar 2015 00:59:24 +0000 (00:59 +0000)]
am
f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
* commit '
f4bbec09a4c3795bc72d6a95aab3488c6c49ce6e':
add tags for wakelock and other API names
Eric Gilmore [Thu, 5 Mar 2015 00:55:48 +0000 (00:55 +0000)]
am
498691d2: am
62777b18: am
5c30adfd: am
22d1c1ce: Merge "Fixing broken link per b/
19503824." into lmp-docs
* commit '
498691d2641deb1ca30938c7777a9a63882ffd87':
Fixing broken link per b/
19503824.
smain@google.com [Thu, 5 Mar 2015 00:49:48 +0000 (00:49 +0000)]
Merge "add tags for wakelock and other API names" into lmp-docs
Eric Gilmore [Thu, 5 Mar 2015 00:49:21 +0000 (00:49 +0000)]
am
62777b18: am
5c30adfd: am
22d1c1ce: Merge "Fixing broken link per b/
19503824." into lmp-docs
* commit '
62777b189dc31c250c4ae06915aae0a337950e1c':
Fixing broken link per b/
19503824.
Bart Sears [Thu, 5 Mar 2015 00:47:15 +0000 (00:47 +0000)]
am
4eedcceb: Merge "Merge commit \'
83a63bac\' into manualmerge" into lmp-mr1-dev
automerge:
3797ee9
* commit '
3797ee96a76225fda7019eb05ca0de0be2efe6c9':
Do not make ActivityContainer available to apps. DO NOT MERGE
Bart Sears [Thu, 5 Mar 2015 00:40:06 +0000 (00:40 +0000)]
am
4eedcceb: Merge "Merge commit \'
83a63bac\' into manualmerge" into lmp-mr1-dev
* commit '
4eedccebb7f4c3f9e2f1890f92bead4b9c2a9819':
Do not make ActivityContainer available to apps. DO NOT MERGE
Bart Sears [Thu, 5 Mar 2015 00:35:07 +0000 (00:35 +0000)]
Merge "Merge commit '
83a63bac' into manualmerge" into lmp-mr1-dev
xinhe [Mon, 2 Mar 2015 22:04:35 +0000 (14:04 -0800)]
add 2 side RTT support on scan
Bug:
19533713
Change-Id: I6b7a32aae1a038eb2941f5564d03a4a0286d5bf3
John Spurlock [Wed, 4 Mar 2015 23:10:35 +0000 (23:10 +0000)]
am
c974ac11: MediaProjectionPermissionActivity: Fix NPE.
automerge:
d3c532e
* commit '
d3c532ef254881fc5bfac198651c9032f8108db9':
MediaProjectionPermissionActivity: Fix NPE.
John Spurlock [Wed, 4 Mar 2015 23:01:52 +0000 (23:01 +0000)]
am
c974ac11: MediaProjectionPermissionActivity: Fix NPE.
* commit '
c974ac11f808968648d26e83a0b64a7fba02ad15':
MediaProjectionPermissionActivity: Fix NPE.
John Spurlock [Tue, 24 Feb 2015 17:14:06 +0000 (12:14 -0500)]
MediaProjectionPermissionActivity: Fix NPE.
Avoid dismissing a null dialog.
Bug:
19492919
Change-Id: I6642bb5194d9818ff3db1266c7c78ed752e23ecf
(cherry picked from commit
3d332f4e67a484abe597576bf329d89655afe720)
Craig Mautner [Wed, 4 Mar 2015 18:10:34 +0000 (10:10 -0800)]
Merge commit '
83a63bac' into manualmerge
Eric Gilmore [Wed, 4 Mar 2015 17:53:31 +0000 (17:53 +0000)]
am
5c30adfd: am
22d1c1ce: Merge "Fixing broken link per b/
19503824." into lmp-docs
* commit '
5c30adfdb6ef4b004ef0b88006660598f40eb6f5':
Fixing broken link per b/
19503824.
Eric Gilmore [Wed, 4 Mar 2015 17:47:01 +0000 (17:47 +0000)]
am
22d1c1ce: Merge "Fixing broken link per b/
19503824." into lmp-docs
* commit '
22d1c1ce1dc3c84d7517ba64a5d07b5946e49514':
Fixing broken link per b/
19503824.
Eric Gilmore [Wed, 4 Mar 2015 17:40:15 +0000 (17:40 +0000)]
Merge "Fixing broken link per b/
19503824." into lmp-docs
Craig Mautner [Wed, 4 Mar 2015 16:15:35 +0000 (16:15 +0000)]
am
8fa394fa: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-dev
* commit '
8fa394fa8c4eb3ca832dac36baf5645a40d449f1':
Do not make ActivityContainer available to apps. DO NOT MERGE
Craig Mautner [Wed, 4 Mar 2015 16:09:28 +0000 (16:09 +0000)]
Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-dev
Dan Sandler [Mon, 2 Mar 2015 03:58:32 +0000 (22:58 -0500)]
Avoid crashing on startup when policy forbids lockscreen camera.
Bug:
19554426
Change-Id: I5b2898d7d114de87d925b5eccc8e4b189e4713de
Luan Nguyen [Tue, 3 Mar 2015 19:08:24 +0000 (11:08 -0800)]
docs: Add new partners to Wear index page
bug:
19550254
Change-Id: If5f4722ff480e965cce998bd6383d3a2df0cfe0d
Eric Gilmore [Tue, 3 Mar 2015 20:10:19 +0000 (12:10 -0800)]
Fixing broken link per b/
19503824.
Change-Id: I4140decb254cf9c9f0eadfce1a3897c240d640d9
Joe Fernandez [Tue, 3 Mar 2015 18:10:19 +0000 (18:10 +0000)]
am
246a3a4a: am
14fcef3b: am
c4418980: am
a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
automerge:
9a447bc
* commit '
9a447bcc6ef9be7933cd7197a80f51cbc159cf85':
Minor typo fixes in managed profile Javadoc reference pages.
OSDN Git Service
