OSDN Git Service

android-x86/frameworks-base.git
11 years agoam 60c4b16e: Merge "docs: NDK r9 Release Notes" into jb-mr2-dev
Joe Fernandez [Mon, 22 Jul 2013 16:16:07 +0000 (09:16 -0700)]
am 60c4b16e: Merge "docs: NDK r9 Release Notes" into jb-mr2-dev

* commit '60c4b16e28748d235d3b7c73906522b2c43d84a5':
  docs: NDK r9 Release Notes

11 years agoMerge "docs: NDK r9 Release Notes" into jb-mr2-dev
Joe Fernandez [Mon, 22 Jul 2013 16:13:20 +0000 (16:13 +0000)]
Merge "docs: NDK r9 Release Notes" into jb-mr2-dev

11 years agodocs: NDK r9 Release Notes
Joe Fernandez [Thu, 13 Jun 2013 21:36:37 +0000 (14:36 -0700)]
docs: NDK r9 Release Notes

Change-Id: I43cae1e306a8313ab2d003dbb762977f75bf8208

11 years agoam ab00d352: am 658374d5: am 2685febd: am 6f75a73c: Merge "docs: Android SDK 22.0...
Joe Fernandez [Fri, 19 Jul 2013 20:34:28 +0000 (13:34 -0700)]
am ab00d352: am 658374d5: am 2685febd: am 6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev

* commit 'ab00d352ffc8a60cf4811cc79dd1dc69bc8ee407':
  docs: Android SDK 22.0.4 Release Notes

11 years agoam 8c87b297: Merge "Make CS.isTetheringSupported dynamic" into jb-mr2-dev
Robert Greenwalt [Fri, 19 Jul 2013 20:34:22 +0000 (13:34 -0700)]
am 8c87b297: Merge "Make CS.isTetheringSupported dynamic" into jb-mr2-dev

* commit '8c87b29793da439b8718227bf2d03405c8ad264a':
  Make CS.isTetheringSupported dynamic

11 years agoam ca3b4e9b: remove significant motion
Scott Main [Fri, 19 Jul 2013 20:34:04 +0000 (13:34 -0700)]
am ca3b4e9b: remove significant motion

* commit 'ca3b4e9b7e5498650993dc99d70acacc1fa2d1fb':
  remove significant motion

11 years agoam 1be76349: Merge "more details about account access in restricted profiles" into...
Scott Main [Fri, 19 Jul 2013 20:34:02 +0000 (13:34 -0700)]
am 1be76349: Merge "more details about account access in restricted profiles" into jb-mr2-dev

* commit '1be763494e9df0d1477dcaa4ba0163cce68f416a':
  more details about account access in restricted profiles

11 years agoam d3ed45f8: am 991487c6: am 9a1f106d: am 34a1fa43: Merge "fix typo in code sample...
Scott Main [Fri, 19 Jul 2013 20:33:58 +0000 (13:33 -0700)]
am d3ed45f8: am 991487c6: am 9a1f106d: am 34a1fa43: Merge "fix typo in code sample" into jb-mr1.1-ub-dev

* commit 'd3ed45f841419b90e1d6813d9bcefbcb91554a63':
  fix typo in code sample

11 years agoam e0380d8f: resolved conflics for merge of 54201120 to jb-mr2-dev
Dirk Dougherty [Fri, 19 Jul 2013 20:33:46 +0000 (13:33 -0700)]
am e0380d8f: resolved conflics for merge of 54201120 to jb-mr2-dev

* commit 'e0380d8fe675a1c1785cfd5d2b7f0c6b59c27c54':
  Doc change: Add Colopl video to carousel and spotlight.

11 years agoam e874bd35: Merge "Add gservices updater for carrier provisioning url" into jb-mr2-dev
Robert Greenwalt [Fri, 19 Jul 2013 20:33:35 +0000 (13:33 -0700)]
am e874bd35: Merge "Add gservices updater for carrier provisioning url" into jb-mr2-dev

* commit 'e874bd351f7b68cead889f55afba505fb5fac97c':
  Add gservices updater for carrier provisioning url

11 years agoam bbc9a62a: Cleaner Tejat notification in Audio Package 11
Jean-Michel Trivi [Fri, 19 Jul 2013 20:33:30 +0000 (13:33 -0700)]
am bbc9a62a: Cleaner Tejat notification in Audio Package 11

* commit 'bbc9a62a71dd35c30eed96db9d4e23a754b55d8d':
  Cleaner Tejat notification in Audio Package 11

11 years agoam e3badc10: Merge "When a SIM is changed check mobile provisioning." into jb-mr2-dev
Wink Saville [Fri, 19 Jul 2013 20:33:19 +0000 (13:33 -0700)]
am e3badc10: Merge "When a SIM is changed check mobile provisioning." into jb-mr2-dev

* commit 'e3badc10112b76db583736767849b2f82ae737fd':
  When a SIM is changed check mobile provisioning.

11 years agoam bf8be2ee: Merge "Add orientation to configuration for layoutlib." into jb-mr2-dev
Deepanshu Gupta [Fri, 19 Jul 2013 20:33:17 +0000 (13:33 -0700)]
am bf8be2ee: Merge "Add orientation to configuration for layoutlib." into jb-mr2-dev

* commit 'bf8be2eefb1f5172582f688cbc090ec04d6908f1':
  Add orientation to configuration for layoutlib.

11 years agoam 0987ff87: Merge "Add Flo to device art generator." into jb-mr2-dev
Roman Nurik [Fri, 19 Jul 2013 20:33:05 +0000 (13:33 -0700)]
am 0987ff87: Merge "Add Flo to device art generator." into jb-mr2-dev

* commit '0987ff8768512c3d519a5d5bbe5c4eb6b54548dc':
  Add Flo to device art generator.

11 years agoam ba8a5413: Fix missing lock in power manager.
Jeff Brown [Fri, 19 Jul 2013 20:32:48 +0000 (13:32 -0700)]
am ba8a5413: Fix missing lock in power manager.

* commit 'ba8a54136d184d48fbed4f7b27734f645e4e8ad0':
  Fix missing lock in power manager.

11 years agoam 7c6be10d: Remove iterators (DO NOT MERGE)
Craig Mautner [Fri, 19 Jul 2013 20:32:40 +0000 (13:32 -0700)]
am 7c6be10d: Remove iterators (DO NOT MERGE)

* commit '7c6be10d314413bb7afbed41017343320319915d':
  Remove iterators (DO NOT MERGE)

11 years agoam 658374d5: am 2685febd: am 6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes...
Joe Fernandez [Fri, 19 Jul 2013 20:05:12 +0000 (13:05 -0700)]
am 658374d5: am 2685febd: am 6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev

* commit '658374d56577a4f8864ba3c7ed8f2e425d13d997':
  docs: Android SDK 22.0.4 Release Notes

11 years agoam 2685febd: am 6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb...
Joe Fernandez [Fri, 19 Jul 2013 20:02:24 +0000 (13:02 -0700)]
am 2685febd: am 6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev

* commit '2685febd0d51bac4da755756b5348eb95c57ef73':
  docs: Android SDK 22.0.4 Release Notes

11 years agoam 6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev
Joe Fernandez [Fri, 19 Jul 2013 19:59:11 +0000 (12:59 -0700)]
am 6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev

* commit '6f75a73c04ebd5f0ae10e6e89618f492d842ed96':
  docs: Android SDK 22.0.4 Release Notes

11 years agoMerge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev
Joe Fernandez [Fri, 19 Jul 2013 19:55:47 +0000 (19:55 +0000)]
Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev

11 years agodocs: Android SDK 22.0.4 Release Notes
Joe Fernandez [Mon, 15 Jul 2013 19:35:05 +0000 (12:35 -0700)]
docs: Android SDK 22.0.4 Release Notes

Change-Id: Ia140f81dce8352860149cf709e1ed0be46c052a0

11 years agoMerge "Make CS.isTetheringSupported dynamic" into jb-mr2-dev
Robert Greenwalt [Fri, 19 Jul 2013 17:10:38 +0000 (17:10 +0000)]
Merge "Make CS.isTetheringSupported dynamic" into jb-mr2-dev

11 years agoremove significant motion
Scott Main [Thu, 18 Jul 2013 23:10:37 +0000 (16:10 -0700)]
remove significant motion

Change-Id: I764d7253d9eb4aa9f7e94f5628a29f648fd9811b

11 years agoMerge "more details about account access in restricted profiles" into jb-mr2-dev
Scott Main [Thu, 18 Jul 2013 22:46:11 +0000 (22:46 +0000)]
Merge "more details about account access in restricted profiles" into jb-mr2-dev

11 years agoam 991487c6: am 9a1f106d: am 34a1fa43: Merge "fix typo in code sample" into jb-mr1...
Scott Main [Thu, 18 Jul 2013 22:22:16 +0000 (15:22 -0700)]
am 991487c6: am 9a1f106d: am 34a1fa43: Merge "fix typo in code sample" into jb-mr1.1-ub-dev

* commit '991487c635ea0cd9ccfaae8e030325c2e8be7a3f':
  fix typo in code sample

11 years agoam 9a1f106d: am 34a1fa43: Merge "fix typo in code sample" into jb-mr1.1-ub-dev
Scott Main [Thu, 18 Jul 2013 22:19:39 +0000 (15:19 -0700)]
am 9a1f106d: am 34a1fa43: Merge "fix typo in code sample" into jb-mr1.1-ub-dev

* commit '9a1f106d9ef33a3ea22d7b34d736586d4fae0447':
  fix typo in code sample

11 years agoam 34a1fa43: Merge "fix typo in code sample" into jb-mr1.1-ub-dev
Scott Main [Thu, 18 Jul 2013 22:16:46 +0000 (15:16 -0700)]
am 34a1fa43: Merge "fix typo in code sample" into jb-mr1.1-ub-dev

* commit '34a1fa43899dc2b0b2f249262b69c922949ab626':
  fix typo in code sample

11 years agoMerge "fix typo in code sample" into jb-mr1.1-ub-dev
Scott Main [Thu, 18 Jul 2013 22:13:55 +0000 (22:13 +0000)]
Merge "fix typo in code sample" into jb-mr1.1-ub-dev

11 years agomore details about account access in restricted profiles
Scott Main [Thu, 18 Jul 2013 22:09:03 +0000 (15:09 -0700)]
more details about account access in restricted profiles

Change-Id: I2710c3e8736748ca3080ee88f076255a6639b1e3

11 years agoMake CS.isTetheringSupported dynamic
Robert Greenwalt [Thu, 18 Jul 2013 21:24:42 +0000 (14:24 -0700)]
Make CS.isTetheringSupported dynamic

It used to be set at boot, but that was too quick to pick up carrier
specific resources.  With this change even if you switch sims subequent
checks get the new values.

bug:9865616
Change-Id: I8c270c6b02fc6bdd3c3d76ceea58172df25e058d

11 years agofix typo in code sample
Scott Main [Thu, 18 Jul 2013 17:18:57 +0000 (10:18 -0700)]
fix typo in code sample

Change-Id: Ic2e36d321f8bc3c414f8cef82319ea376eaa296e

11 years agoresolved conflics for merge of 54201120 to jb-mr2-dev
Dirk Dougherty [Thu, 18 Jul 2013 01:44:03 +0000 (18:44 -0700)]
resolved conflics for merge of 54201120 to jb-mr2-dev

Change-Id: If1675be05e403c33b320608333cb28ce2d9b68aa

11 years agoam 7eae1ef0: am c7e4be8a: Doc change: Add Colopl video to carousel and spotlight.
Dirk Dougherty [Thu, 18 Jul 2013 01:19:38 +0000 (18:19 -0700)]
am 7eae1ef0: am c7e4be8a: Doc change: Add Colopl video to carousel and spotlight.

* commit '7eae1ef0d972911d8225de6aeebf33b806ec7037':
  Doc change: Add Colopl video to carousel and spotlight.

11 years agoam c7e4be8a: Doc change: Add Colopl video to carousel and spotlight.
Dirk Dougherty [Thu, 18 Jul 2013 01:16:36 +0000 (18:16 -0700)]
am c7e4be8a: Doc change: Add Colopl video to carousel and spotlight.

* commit 'c7e4be8abdc1ce11cb0197de0e393cf39fb38c9e':
  Doc change: Add Colopl video to carousel and spotlight.

11 years agoDoc change: Add Colopl video to carousel and spotlight.
Dirk Dougherty [Thu, 18 Jul 2013 01:00:35 +0000 (18:00 -0700)]
Doc change: Add Colopl video to carousel and spotlight.

Change-Id: I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93

11 years agoMerge "Add gservices updater for carrier provisioning url" into jb-mr2-dev
Robert Greenwalt [Wed, 17 Jul 2013 23:46:25 +0000 (23:46 +0000)]
Merge "Add gservices updater for carrier provisioning url" into jb-mr2-dev

11 years agoCleaner Tejat notification in Audio Package 11
Jean-Michel Trivi [Wed, 17 Jul 2013 22:38:57 +0000 (15:38 -0700)]
Cleaner Tejat notification in Audio Package 11

Add a reworked version of "Tejat", at 48kHz.
 The original asset is "/data/sounds//notifications/wav/Deneb.wav".
Use this new version in Audio Package 11 under its original name.

Bug 9900161

Change-Id: I4d7c73715db4e52f5c89aeca726f8b314e0895d5

11 years agoAdd gservices updater for carrier provisioning url
Robert Greenwalt [Tue, 16 Jul 2013 19:06:09 +0000 (12:06 -0700)]
Add gservices updater for carrier provisioning url

bug:9623159
Change-Id: I36697ed341353b7a3dbec5afe20241102e76f6f1

11 years agoMerge "When a SIM is changed check mobile provisioning." into jb-mr2-dev
Wink Saville [Wed, 17 Jul 2013 18:43:30 +0000 (18:43 +0000)]
Merge "When a SIM is changed check mobile provisioning." into jb-mr2-dev

11 years agoMerge "Add orientation to configuration for layoutlib." into jb-mr2-dev
Deepanshu Gupta [Wed, 17 Jul 2013 18:38:42 +0000 (18:38 +0000)]
Merge "Add orientation to configuration for layoutlib." into jb-mr2-dev

11 years agoMerge "Add Flo to device art generator." into jb-mr2-dev
Roman Nurik [Wed, 17 Jul 2013 16:17:14 +0000 (16:17 +0000)]
Merge "Add Flo to device art generator." into jb-mr2-dev

11 years agoWhen a SIM is changed check mobile provisioning.
Wink Saville [Wed, 17 Jul 2013 00:16:37 +0000 (17:16 -0700)]
When a SIM is changed check mobile provisioning.

A simple mechanism for doing this is to take advantage of the fact
that we require the device to reboot after a sim has been changed.
Thus when connectivity service is started we wait to get a connection
then call checkMobileProvisioning once. We also add a check that
the DEVICE_PROVISIONED is true, i.e. SetupWizard has been run.

Bug: 9784024
Change-Id: I5c1936744f6fc55a447ae44cd36eec3849d27e21

11 years agoFix missing lock in power manager.
Jeff Brown [Tue, 16 Jul 2013 22:18:19 +0000 (15:18 -0700)]
Fix missing lock in power manager.

The display wake lock and other internal state could become
out of sync if we happened to execute the power manager's update
function concurrently due to the missing lock.

This bug can be trigged due to display state changes or proximity
sensor updated.  Although it would be extremely rare, we have
some evidence of this happening on at least a few devices resulting
in rapid power drain with the screen off or a crash.

Bug: 9880044
Change-Id: I3c674ce429621a50cbb36c3a01883d5f388205b2
(cherry picked from commit d91e417b06388694db213257b4df6b4dd78e0d49)

11 years agoAdd Flo to device art generator.
Roman Nurik [Tue, 16 Jul 2013 21:32:12 +0000 (14:32 -0700)]
Add Flo to device art generator.

Change-Id: I69e5d3ff3685c250d3c44bc616aec515ebc4835e

11 years agoRemove iterators (DO NOT MERGE)
Craig Mautner [Tue, 16 Jul 2013 19:30:28 +0000 (12:30 -0700)]
Remove iterators (DO NOT MERGE)

Remove DisplayContentsIterator and AllWindowsIterator. These were cute
but they take up valuable resources. Iterate over ArrayList members
in their place.

Change-Id: Ie0c537608532cfb36f34d976cc6eacd21bad98cd

11 years agoAdd orientation to configuration for layoutlib.
Deepanshu Gupta [Fri, 12 Jul 2013 22:24:51 +0000 (15:24 -0700)]
Add orientation to configuration for layoutlib.

Update the configuration with the device orientation before rendering.

Change-Id: Icd40901204fd13f90b18353e53a15e25e5b2176c

11 years agoam c0f5bb70: am ca4b112e: am 546ac85a: am ad17523d: add warning for Windows users...
Scott Main [Fri, 12 Jul 2013 21:22:48 +0000 (14:22 -0700)]
am c0f5bb70: am ca4b112e: am 546ac85a: am ad17523d: add warning for Windows users and fix typos

* commit 'c0f5bb70b72c25c0057d2318bbcc8d79553d1e12':
  add warning for Windows users and fix typos

11 years agoam ca4b112e: am 546ac85a: am ad17523d: add warning for Windows users and fix typos
Scott Main [Fri, 12 Jul 2013 21:20:11 +0000 (14:20 -0700)]
am ca4b112e: am 546ac85a: am ad17523d: add warning for Windows users and fix typos

* commit 'ca4b112eb243b1350aba000c4f021574be25bd96':
  add warning for Windows users and fix typos

11 years agoam 546ac85a: am ad17523d: add warning for Windows users and fix typos
Scott Main [Fri, 12 Jul 2013 21:17:30 +0000 (14:17 -0700)]
am 546ac85a: am ad17523d: add warning for Windows users and fix typos

* commit '546ac85a834cf033cf1f3ce82624f1f4a63d099f':
  add warning for Windows users and fix typos

11 years agoam ad17523d: add warning for Windows users and fix typos
Scott Main [Fri, 12 Jul 2013 21:15:15 +0000 (14:15 -0700)]
am ad17523d: add warning for Windows users and fix typos

* commit 'ad17523da976c2d6b7b70fd3aa9ad290e4731224':
  add warning for Windows users and fix typos

11 years agoadd warning for Windows users and fix typos
Scott Main [Fri, 12 Jul 2013 18:28:01 +0000 (11:28 -0700)]
add warning for Windows users and fix typos

Change-Id: I694baa83cde2b97cf0159a75358fa129bd656da3

11 years agoam 925ec03f: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one...
Wink Saville [Fri, 12 Jul 2013 19:01:41 +0000 (12:01 -0700)]
am 925ec03f: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev

* commit '925ec03fcd9651ff4c6b04982eb6d930b16493b9':
  VZW wants the phoneNumber to be 10 zero's if there isn't one.

11 years agoMerge "VZW wants the phoneNumber to be 10 zero's if there isn't one." into jb-mr2-dev
Wink Saville [Fri, 12 Jul 2013 18:59:03 +0000 (18:59 +0000)]
Merge "VZW wants the phoneNumber to be 10 zero's if there isn't one." into jb-mr2-dev

11 years agoam 06a441de: Merge "Pass along the user id to AttributeCache requests" into jb-mr2-dev
Amith Yamasani [Fri, 12 Jul 2013 18:19:24 +0000 (11:19 -0700)]
am 06a441de: Merge "Pass along the user id to AttributeCache requests" into jb-mr2-dev

* commit '06a441de3b6756cf49879ff445ac26c66da54d02':
  Pass along the user id to AttributeCache requests

11 years agoMerge "Pass along the user id to AttributeCache requests" into jb-mr2-dev
Amith Yamasani [Fri, 12 Jul 2013 18:17:09 +0000 (18:17 +0000)]
Merge "Pass along the user id to AttributeCache requests" into jb-mr2-dev

11 years agoam c079e43f: am e920ab1a: am a618e938: am c660c608: Merge "add Toshiba usb driver...
Scott Main [Fri, 12 Jul 2013 01:12:01 +0000 (18:12 -0700)]
am c079e43f: am e920ab1a: am a618e938: am c660c608: Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017" into jb-mr1.1-ub-dev

* commit 'c079e43fc317087ae5517ee7d9a376e97fef0f57':
  add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017

11 years agoam e920ab1a: am a618e938: am c660c608: Merge "add Toshiba usb driver link delete...
Scott Main [Fri, 12 Jul 2013 01:09:53 +0000 (18:09 -0700)]
am e920ab1a: am a618e938: am c660c608: Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017" into jb-mr1.1-ub-dev

* commit 'e920ab1a82327976e0a25842d7d57dc7a92ba604':
  add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017

11 years agoam a618e938: am c660c608: Merge "add Toshiba usb driver link delete Fujitsu-Toshiba...
Scott Main [Fri, 12 Jul 2013 01:08:01 +0000 (18:08 -0700)]
am a618e938: am c660c608: Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017" into jb-mr1.1-ub-dev

* commit 'a618e93891603f825fd2c0ec1a67c96c29863dcd':
  add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017

11 years agoam e4709679: am c1addd47: am c7da42d7: am f7832a35: am d6bbda24: am bc5f9b66: Merge...
Dirk Dougherty [Fri, 12 Jul 2013 01:06:22 +0000 (18:06 -0700)]
am e4709679: am c1addd47: am c7da42d7: am f7832a35: am d6bbda24: am bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs

* commit 'e4709679198590fa37fbad67df0d7e3827c4f8cf':
  Doc change: Update gcore reference docs.

11 years agoam c660c608: Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017...
Scott Main [Fri, 12 Jul 2013 01:05:44 +0000 (18:05 -0700)]
am c660c608: Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017" into jb-mr1.1-ub-dev

* commit 'c660c608e75791d5b4b286f34a9ec335f9e95ba6':
  add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017

11 years agoMerge "add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017" into jb-mr1...
Scott Main [Fri, 12 Jul 2013 01:03:22 +0000 (01:03 +0000)]
Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017" into jb-mr1.1-ub-dev

11 years agoam c1addd47: am c7da42d7: am f7832a35: am d6bbda24: am bc5f9b66: Merge "Doc change...
Dirk Dougherty [Fri, 12 Jul 2013 01:03:17 +0000 (18:03 -0700)]
am c1addd47: am c7da42d7: am f7832a35: am d6bbda24: am bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs

* commit 'c1addd4750be5b1721a8668a110e74fa59e476c6':
  Doc change: Update gcore reference docs.

11 years agoam c7da42d7: am f7832a35: am d6bbda24: am bc5f9b66: Merge "Doc change: Update gcore...
Dirk Dougherty [Fri, 12 Jul 2013 01:01:26 +0000 (18:01 -0700)]
am c7da42d7: am f7832a35: am d6bbda24: am bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs

* commit 'c7da42d76470c4e9fb541058e942e31163275b83':
  Doc change: Update gcore reference docs.

11 years agoam f7832a35: am d6bbda24: am bc5f9b66: Merge "Doc change: Update gcore reference...
Dirk Dougherty [Fri, 12 Jul 2013 00:59:22 +0000 (17:59 -0700)]
am f7832a35: am d6bbda24: am bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs

* commit 'f7832a35f3961e1b6665b5428899cdad598f0544':
  Doc change: Update gcore reference docs.

11 years agoam d6bbda24: am bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb...
Dirk Dougherty [Fri, 12 Jul 2013 00:56:35 +0000 (17:56 -0700)]
am d6bbda24: am bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs

* commit 'd6bbda24150eddc59865133377f6b41c8a1ed3b5':
  Doc change: Update gcore reference docs.

11 years agoam bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs
Dirk Dougherty [Fri, 12 Jul 2013 00:54:00 +0000 (17:54 -0700)]
am bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs

* commit 'bc5f9b66744b76c676543902d31d324f2dd02d09':
  Doc change: Update gcore reference docs.

11 years agoMerge "Doc change: Update gcore reference docs." into jb-mr1.1-docs
Dirk Dougherty [Fri, 12 Jul 2013 00:50:59 +0000 (00:50 +0000)]
Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs

11 years agoam 24810c6f: am 3c13e528: am 536fa1bb: am 84ad0894: fix markup error in download...
Scott Main [Fri, 12 Jul 2013 00:44:09 +0000 (17:44 -0700)]
am 24810c6f: am 3c13e528: am 536fa1bb: am 84ad0894: fix markup error in download button and fix transition to install/update guide

* commit '24810c6f5854e595b2c78f9c3e44b7d4045a7472':
  fix markup error in download button and fix transition to install/update guide

11 years agoam 3c13e528: am 536fa1bb: am 84ad0894: fix markup error in download button and fix...
Scott Main [Fri, 12 Jul 2013 00:41:48 +0000 (17:41 -0700)]
am 3c13e528: am 536fa1bb: am 84ad0894: fix markup error in download button and fix transition to install/update guide

* commit '3c13e5284e83390301bf3306e5d77f7014483ea0':
  fix markup error in download button and fix transition to install/update guide

11 years agoam 536fa1bb: am 84ad0894: fix markup error in download button and fix transition...
Scott Main [Fri, 12 Jul 2013 00:38:31 +0000 (17:38 -0700)]
am 536fa1bb: am 84ad0894: fix markup error in download button and fix transition to install/update guide

* commit '536fa1bbe10b793e7c5d585c974693349fb8a4f5':
  fix markup error in download button and fix transition to install/update guide

11 years agoam 84ad0894: fix markup error in download button and fix transition to install/update...
Scott Main [Fri, 12 Jul 2013 00:36:53 +0000 (17:36 -0700)]
am 84ad0894: fix markup error in download button and fix transition to install/update guide

* commit '84ad0894be13b374b9b75e204dabea6a1579e131':
  fix markup error in download button and fix transition to install/update guide

11 years agofix markup error in download button and fix transition to install/update guide
Scott Main [Fri, 12 Jul 2013 00:26:13 +0000 (17:26 -0700)]
fix markup error in download button and fix transition to install/update guide

Change-Id: I54b6ed06247ff7456089058549e373a19d9e5016

11 years agoam 116d4665: Merge "Block Wifi P2p discovery while doing dhcp." into jb-mr2-dev
Robert Greenwalt [Fri, 12 Jul 2013 00:07:06 +0000 (17:07 -0700)]
am 116d4665: Merge "Block Wifi P2p discovery while doing dhcp." into jb-mr2-dev

* commit '116d46659889f588fa9ffa5e1bc4dda90067fce6':
  Block Wifi P2p discovery while doing dhcp.

11 years agoMerge "Block Wifi P2p discovery while doing dhcp." into jb-mr2-dev
Robert Greenwalt [Fri, 12 Jul 2013 00:04:45 +0000 (00:04 +0000)]
Merge "Block Wifi P2p discovery while doing dhcp." into jb-mr2-dev

11 years agoam 57b0fed7: am 603c3d8a: am 3e82a9c9: am 276f0ce4: update Android Studio for v0...
Scott Main [Thu, 11 Jul 2013 23:47:53 +0000 (16:47 -0700)]
am 57b0fed7: am 603c3d8a: am 3e82a9c9: am 276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics

* commit '57b0fed7a9a1a1fe6ed5dce3bb6855f03c1b15a8':
  update Android Studio for v0.2.0. add release notes and troubleshooting topics

11 years agoam 603c3d8a: am 3e82a9c9: am 276f0ce4: update Android Studio for v0.2.0. add release...
Scott Main [Thu, 11 Jul 2013 23:44:58 +0000 (16:44 -0700)]
am 603c3d8a: am 3e82a9c9: am 276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics

* commit '603c3d8a9ac2b81be0ea09690ba324e2ed744ccd':
  update Android Studio for v0.2.0. add release notes and troubleshooting topics

11 years agoam 3e82a9c9: am 276f0ce4: update Android Studio for v0.2.0. add release notes and...
Scott Main [Thu, 11 Jul 2013 23:42:47 +0000 (16:42 -0700)]
am 3e82a9c9: am 276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics

* commit '3e82a9c9a5339dca5f4a91c6e5822906cd632ae2':
  update Android Studio for v0.2.0. add release notes and troubleshooting topics

11 years agoam 276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting...
Scott Main [Thu, 11 Jul 2013 23:40:11 +0000 (16:40 -0700)]
am 276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics

* commit '276f0ce4df7f58786da08c34f548456129144aed':
  update Android Studio for v0.2.0. add release notes and troubleshooting topics

11 years agoupdate Android Studio for v0.2.0.
Scott Main [Thu, 11 Jul 2013 22:31:10 +0000 (15:31 -0700)]
update Android Studio for v0.2.0.
add release notes and troubleshooting topics

Change-Id: Ic924d61f9ab9208ed3275edb8837d8593d752ae9

11 years agoadd Toshiba usb driver link
Scott Main [Tue, 9 Jul 2013 17:43:45 +0000 (10:43 -0700)]
add Toshiba usb driver link
delete Fujitsu-Toshiba
bug: 9755017

Change-Id: If1417c7e697a2bea9fbdd3086ffeaf1528627364

11 years agoam 1f99a483: Recover from corrupt network stats.
Jeff Sharkey [Thu, 11 Jul 2013 18:38:50 +0000 (11:38 -0700)]
am 1f99a483: Recover from corrupt network stats.

* commit '1f99a483e410811473b12d8efedd79c738df7af3':
  Recover from corrupt network stats.

11 years agoRecover from corrupt network stats.
Jeff Sharkey [Thu, 11 Jul 2013 18:18:53 +0000 (11:18 -0700)]
Recover from corrupt network stats.

When encountering corrupt stats, throw as IOException to allow
recovery at a higher level.

Bug: 9794832
Change-Id: I38d000b3bd8a4c99389c40a87ee0699efb6e9049

11 years agoBlock Wifi P2p discovery while doing dhcp.
Robert Greenwalt [Fri, 28 Jun 2013 22:55:28 +0000 (15:55 -0700)]
Block Wifi P2p discovery while doing dhcp.

bug:9531609
bug:9302399
Change-Id: Ie4b7c3a75245a0e7cc09fa89ddb1187d349779a1

11 years agoVZW wants the phoneNumber to be 10 zero's if there isn't one.
Wink Saville [Thu, 11 Jul 2013 06:00:07 +0000 (23:00 -0700)]
VZW wants the phoneNumber to be 10 zero's if there isn't one.

Bug: 9784059
Change-Id: I41bba908855648d2560440655d8a75a7cb2e0859

11 years agoDoc change: Update gcore reference docs.
Dirk Dougherty [Fri, 28 Jun 2013 21:04:39 +0000 (14:04 -0700)]
Doc change: Update gcore reference docs.

Change-Id: I9064969741598663ba7a732054ee378d3a14da7e

11 years agoPass along the user id to AttributeCache requests
Amith Yamasani [Wed, 10 Jul 2013 23:18:01 +0000 (16:18 -0700)]
Pass along the user id to AttributeCache requests

Bug: 9759331
Change-Id: Ib96ba6a89c58edc207021aa43a2b67b4f6c50117

11 years agoam 29282f99: am b1b693ee: am 5e0582cc: am 7cf27aa8: Merge "update url for backup...
Scott Main [Tue, 9 Jul 2013 17:56:35 +0000 (10:56 -0700)]
am 29282f99: am b1b693ee: am 5e0582cc: am 7cf27aa8: Merge "update url for backup service key bug: 8834302" into jb-mr1.1-ub-dev

* commit '29282f99252237dd9674737d26ce72afbfdd3ac1':
  update url for backup service key bug: 8834302

11 years agoam 0f97f351: am cfb8f9a0: am 3059c708: am d5fee164: Merge "docs: add link to develope...
Dirk Dougherty [Tue, 9 Jul 2013 17:56:32 +0000 (10:56 -0700)]
am 0f97f351: am cfb8f9a0: am 3059c708: am d5fee164: Merge "docs: add link to developer survey on main landing pages" into jb-mr1.1-ub-dev

* commit '0f97f3510bbef333887440b6f0bc65aea2352597':
  docs: add link to developer survey on main landing pages

11 years agoam b1b693ee: am 5e0582cc: am 7cf27aa8: Merge "update url for backup service key bug...
Scott Main [Tue, 9 Jul 2013 17:54:18 +0000 (10:54 -0700)]
am b1b693ee: am 5e0582cc: am 7cf27aa8: Merge "update url for backup service key bug: 8834302" into jb-mr1.1-ub-dev

* commit 'b1b693eec6e171a059190e6f17ff53b8c558cbb3':
  update url for backup service key bug: 8834302

11 years agoam cfb8f9a0: am 3059c708: am d5fee164: Merge "docs: add link to developer survey...
Dirk Dougherty [Tue, 9 Jul 2013 17:54:13 +0000 (10:54 -0700)]
am cfb8f9a0: am 3059c708: am d5fee164: Merge "docs: add link to developer survey on main landing pages" into jb-mr1.1-ub-dev

* commit 'cfb8f9a07681cc090428a47aa856cba51be29ce5':
  docs: add link to developer survey on main landing pages

11 years agoam 5e0582cc: am 7cf27aa8: Merge "update url for backup service key bug: 8834302"...
Scott Main [Tue, 9 Jul 2013 17:52:44 +0000 (10:52 -0700)]
am 5e0582cc: am 7cf27aa8: Merge "update url for backup service key bug: 8834302" into jb-mr1.1-ub-dev

* commit '5e0582cc0e09a209bed321323ad9dad3ca51dcb1':
  update url for backup service key bug: 8834302

11 years agoam 3059c708: am d5fee164: Merge "docs: add link to developer survey on main landing...
Dirk Dougherty [Tue, 9 Jul 2013 17:52:40 +0000 (10:52 -0700)]
am 3059c708: am d5fee164: Merge "docs: add link to developer survey on main landing pages" into jb-mr1.1-ub-dev

* commit '3059c70844848c7bd1aad7bffd2d5828cf745540':
  docs: add link to developer survey on main landing pages

11 years agoam 7cf27aa8: Merge "update url for backup service key bug: 8834302" into jb-mr1.1...
Scott Main [Tue, 9 Jul 2013 17:51:18 +0000 (10:51 -0700)]
am 7cf27aa8: Merge "update url for backup service key bug: 8834302" into jb-mr1.1-ub-dev

* commit '7cf27aa8e3fe4735d1cf787917a524e472376e6e':
  update url for backup service key bug: 8834302

11 years agoam d5fee164: Merge "docs: add link to developer survey on main landing pages" into...
Dirk Dougherty [Tue, 9 Jul 2013 17:51:15 +0000 (10:51 -0700)]
am d5fee164: Merge "docs: add link to developer survey on main landing pages" into jb-mr1.1-ub-dev

* commit 'd5fee1644ec9829400dda77c650694f41c5decc3':
  docs: add link to developer survey on main landing pages

11 years agoMerge "update url for backup service key bug: 8834302" into jb-mr1.1-ub-dev
Scott Main [Tue, 9 Jul 2013 17:50:18 +0000 (17:50 +0000)]
Merge "update url for backup service key bug: 8834302" into jb-mr1.1-ub-dev

11 years agoMerge "docs: add link to developer survey on main landing pages" into jb-mr1.1-ub-dev
Dirk Dougherty [Tue, 9 Jul 2013 17:50:07 +0000 (17:50 +0000)]
Merge "docs: add link to developer survey on main landing pages" into jb-mr1.1-ub-dev

11 years agoupdate url for backup service key
Scott Main [Tue, 9 Jul 2013 17:48:02 +0000 (10:48 -0700)]
update url for backup service key
bug: 8834302

Change-Id: I7bd35db2531bf03c7503cdf56f932cedacaa6771

11 years agoam b7925f22: Merge "Revert "Stop marking gamepads as keyboards"" into jb-mr2-dev
Satoshi Kataoka [Tue, 9 Jul 2013 17:23:00 +0000 (10:23 -0700)]
am b7925f22: Merge "Revert "Stop marking gamepads as keyboards"" into jb-mr2-dev

* commit 'b7925f2219480d4ddbb1c655b9b386ed031815a3':
  Revert "Stop marking gamepads as keyboards"

11 years agoMerge "Revert "Stop marking gamepads as keyboards"" into jb-mr2-dev
Satoshi Kataoka [Tue, 9 Jul 2013 17:20:37 +0000 (17:20 +0000)]
Merge "Revert "Stop marking gamepads as keyboards"" into jb-mr2-dev

11 years agoam ea4193ef: am 46e8ca92: am a4d3dedc: am 420b8212: am a59eb93d: am a6241377: Doc...
Joe Malin [Tue, 9 Jul 2013 17:09:00 +0000 (10:09 -0700)]
am ea4193ef: am 46e8ca92: am a4d3dedc: am 420b8212: am a59eb93d: am a6241377: Doc Bug: b9739899 Bugs in Sync Adapters training

* commit 'ea4193efaafb280e9e969cae72a4f43b913ae8b0':
  Doc Bug: b9739899 Bugs in Sync Adapters training