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

158653 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Fernandez
d1c3c83dc3 am 09cce6f5: Merge "docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE result" into lmp-dev 
* commit '09cce6f509af58e3eeaf687b63e292c222a7d769':
  docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE result
 2014-10-17 21:44:39 +00:00
Joe Fernandez
09cce6f509 Merge "docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE result" into lmp-dev 2014-10-17 21:39:27 +00:00
Andrew Solovay
1c56c15d4d docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE result 
See first comment for doc staging directory.

bug: 18000631
Change-Id: I4dba47e0965947774adad86218369678311f4a0c
 2014-10-17 14:05:22 -07:00
Joe Fernandez
5259fee88e am f21746fc: Merge "docs: update location of sample apps" into lmp-dev 
* commit 'f21746fca8603ed5a4d328b804ad6de24226ef49':
  docs: update location of sample apps
 2014-10-17 19:44:38 +00:00
Joe Fernandez
f21746fca8 Merge "docs: update location of sample apps" into lmp-dev 2014-10-17 19:39:28 +00:00
Amith Yamasani
3de84d0de6 am a865bb5d: Merge "Use the correct method to check if device is encrypted" into lmp-dev 
* commit 'a865bb5df834194dee339db615c17d7c7b63aaa3':
  Use the correct method to check if device is encrypted
 2014-10-17 18:58:58 +00:00
Amith Yamasani
a865bb5df8 Merge "Use the correct method to check if device is encrypted" into lmp-dev 2014-10-17 18:55:58 +00:00
smain@google.com
70d0ca89d1 am af8de90f: Merge "fix 1% mystery bug on preview image downloads. just remove the hashchange listener; no more back-navigation, eh." into lmp-dev 
* commit 'af8de90fd604d3a677947e72b0000bd1075c3665':
  fix 1% mystery bug on preview image downloads. just remove the hashchange listener; no more back-navigation, eh.
 2014-10-17 18:52:28 +00:00
smain@google.com
af8de90fd6 Merge "fix 1% mystery bug on preview image downloads. just remove the hashchange listener; no more back-navigation, eh." into lmp-dev 2014-10-17 18:47:12 +00:00
smain@google.com
3552be039a fix 1% mystery bug on preview image downloads. 
just remove the hashchange listener; no more back-navigation, eh.

Change-Id: I6c822336f33448d9ce01e710fbea2ab134fb8718
 2014-10-17 11:45:33 -07:00
Amith Yamasani
cd410ba4e8 Use the correct method to check if device is encrypted 
DPM's method will return false if encrypted by default password,
preventing the changing of encryption password to lockscreen password.

Check if the device is encrypted by some means, instead.

Also fix a SecurityException when Device Admin queries encryption state
(recent regression)

Bug: 17881324
Change-Id: Id897e61c5e254ab3f8dc569285428a73005303ea
 2014-10-17 11:43:57 -07:00
Quddus Chong
f039ad9023 am c598a4a4: Merge "docs: Fixed sound and vibration section in Android 5.0 API overview." into lmp-dev 
* commit 'c598a4a4d5739dbdac7674d86125a347696937f6':
  docs: Fixed sound and vibration section in Android 5.0 API overview.
 2014-10-17 18:37:06 +00:00
Quddus Chong
c598a4a4d5 Merge "docs: Fixed sound and vibration section in Android 5.0 API overview." into lmp-dev 2014-10-17 18:32:02 +00:00
Scott Rowe
87b1d0d099 docs: update location of sample apps 
Change-Id: I5079d5578c29cde387d087ec8767ae03aaa7ebe2
 2014-10-17 10:46:04 -07:00
Quddus Chong
7b4e310de9 docs: Fixed sound and vibration section in Android 5.0 API overview. 
Change-Id: Icb5379cb1c390c011c9ca8c1d585ebcaea8f92dc
 2014-10-17 10:17:55 -07:00
Dianne Hackborn
53cf2d4b9f am 52476989: Merge "SDK only: hide the old L API version constant." into lmp-dev 
* commit '52476989b8afc0e96c2218625031ed550b12c79b':
  SDK only: hide the old L API version constant.
 2014-10-17 17:15:02 +00:00
Dianne Hackborn
52476989b8 Merge "SDK only: hide the old L API version constant." into lmp-dev 2014-10-17 17:11:24 +00:00
smain@google.com
1cdd6c2075 am fe511970: Merge "edits to the Lollipop highlights" into lmp-dev 
* commit 'fe51197084ab70ea48a9ddf13ecc0d0afe81d0ea':
  edits to the Lollipop highlights
 2014-10-17 16:51:48 +00:00
smain@google.com
fe51197084 Merge "edits to the Lollipop highlights" into lmp-dev 2014-10-17 16:47:33 +00:00
smain@google.com
519ea74a47 edits to the Lollipop highlights 
Change-Id: I1702946aca8c30528488465be422a9b68a9ae049
 2014-10-17 09:40:49 -07:00
Vince Harron
13c77eeb27 am 6da9e548: Merge "Updated Android SDK/Studio system requirements" into lmp-dev 
* commit '6da9e5481aa78fa3541f0546f237049f9d8e3b81':
  Updated Android SDK/Studio system requirements
 2014-10-17 16:15:28 +00:00
Vince Harron
6da9e5481a Merge "Updated Android SDK/Studio system requirements" into lmp-dev 2014-10-17 16:12:06 +00:00
Quddus Chong
5fb5179a75 am 15d2e768: Merge "docs: Updated Android 5.0 API Overview to reflect that setting the device to RINGER_MODE_NORMAL or RINGER_MODE_VIBRATE causes the device to leave priority mode." into lmp-dev 
* commit '15d2e768d67b23fc374895dac8024d40598ffc72':
  docs: Updated Android 5.0 API Overview to reflect that   setting the device to RINGER_MODE_NORMAL or RINGER_MODE_VIBRATE   causes the device to leave priority mode.
 2014-10-17 16:09:50 +00:00
Trevor Johns
ab0b33ba39 am ac21dbb4: Docs: Update "What\'s New" for L Final Preview samples 
* commit 'ac21dbb447158c7c75e154277c5f5f19ed456315':
  Docs: Update "What's New" for L Final Preview samples
 2014-10-17 16:09:45 +00:00
Quddus Chong
15d2e768d6 Merge "docs: Updated Android 5.0 API Overview to reflect that setting the device to RINGER_MODE_NORMAL or RINGER_MODE_VIBRATE causes the device to leave priority mode." into lmp-dev 2014-10-17 16:08:44 +00:00
Trevor Johns
ac21dbb447 Docs: Update "What's New" for L Final Preview samples 
Change-Id: Idc414ffa3b391212136601bd0f65dbcab07efe1e
 2014-10-17 09:02:19 -07:00
Quddus Chong
2e4a929f36 docs: Updated Android 5.0 API Overview to reflect that 
setting the device to RINGER_MODE_NORMAL or RINGER_MODE_VIBRATE
  causes the device to leave priority mode.

Change-Id: I9a7be4529f757417a62ca376df39bf01309e1e69
 2014-10-17 08:59:49 -07:00
Neil Fuller
5a135a1cbb am 9b0109eb: am c7aa8fe6: Merge "Removing some more FloatMath references" 
* commit '9b0109eb051fcf0a7ad801d03e73aa4e0bf2d7a7':
  Removing some more FloatMath references
 2014-10-17 14:59:41 +00:00
Neil Fuller
9b0109eb05 am c7aa8fe6: Merge "Removing some more FloatMath references" 
* commit 'c7aa8fe62356fc09962941140c8bb7ed8bab2f8f':
  Removing some more FloatMath references
 2014-10-17 14:54:17 +00:00
Neil Fuller
c7aa8fe623 Merge "Removing some more FloatMath references" 2014-10-17 14:48:17 +00:00
Jim Miller
f85be7172b am 7d96dc6d: Merge "Fix getStorageEncryptionStatus() in DevicePolicyManager" into lmp-dev 
* commit '7d96dc6d98774ff9b7cf1370f9a5508c4eac6a85':
  Fix getStorageEncryptionStatus() in DevicePolicyManager
 2014-10-17 09:35:06 +00:00
Jim Miller
7d96dc6d98 Merge "Fix getStorageEncryptionStatus() in DevicePolicyManager" into lmp-dev 2014-10-17 09:31:04 +00:00
Dirk Dougherty
eab518b443 am 22fa76da: Merge "Doc change: Add Lollipop to platform versions table." into lmp-dev 
* commit '22fa76dac8de6cfd9e7bc1eb8800f4cddbfc0640':
  Doc change: Add Lollipop to platform versions table.
 2014-10-17 09:24:36 +00:00
Dirk Dougherty
22fa76dac8 Merge "Doc change: Add Lollipop to platform versions table." into lmp-dev 2014-10-17 09:21:29 +00:00
Dirk Dougherty
2b86948e46 Doc change: Add Lollipop to platform versions table. 
Change-Id: Iad84444396a3b2d24403e88398ca21933741b819
 2014-10-17 02:16:58 -07:00
smain@google.com
4943d37ea5 am c8cef6cc: Merge "time to forget about honeycomb and gingerbread." into lmp-dev 
* commit 'c8cef6ccbb470b66b99ec9286728bc875ead6ce7':
  time to forget about honeycomb and gingerbread.
 2014-10-17 09:15:41 +00:00
smain@google.com
e1d6e05c31 am 8adb5fd1: Merge "fix links on preview page" into lmp-dev 
* commit '8adb5fd14dae51faeb5b85b8cbcfc0930094e73f':
  fix links on preview page
 2014-10-17 09:15:37 +00:00
Dan Albert
3f12158f0b am b9734228: (-s ours) am 69c8d39d: Merge "Clean up unused parameter warnings." 
* commit 'b9734228046d541539ae7ce4f5ba22b9e2153e77':
  Clean up unused parameter warnings.
 2014-10-17 09:02:25 +00:00
smain@google.com
c8cef6ccbb Merge "time to forget about honeycomb and gingerbread." into lmp-dev 2014-10-17 08:37:16 +00:00
smain@google.com
ae8355247a time to forget about honeycomb and gingerbread. 
Change-Id: I74a1a62109f28b6ed08acee4761e25bfe8278257
 2014-10-17 01:35:12 -07:00
smain@google.com
fa4c1ce1cc Merge "edits to the lollipop highlights" into lmp-dev 
automerge: f19f639

* commit 'f19f639773e64289ed7345b8a1ea4dd244aa4882':
  edits to the lollipop highlights
 2014-10-17 08:33:01 +00:00
smain@google.com
8adb5fd14d Merge "fix links on preview page" into lmp-dev 2014-10-17 08:32:20 +00:00
smain@google.com
f7a7d6de7a fix links on preview page 
Change-Id: If2c3380dcb3ecc2770ba84fd6599ba69ea0a33f2
 2014-10-17 01:31:24 -07:00
smain@google.com
f19f639773 Merge "edits to the lollipop highlights" into lmp-dev 2014-10-17 08:18:47 +00:00
smain@google.com
1b41dbf4fa edits to the lollipop highlights 
Change-Id: I7efaae064780c3f778f25d11e9378852c11eb5eb
 2014-10-17 01:16:58 -07:00
Joe Fernandez
4ed4a86d6d am e7cc9e80: Merge "docs: Android TV docs fixes for L SDK release" into lmp-dev 
* commit 'e7cc9e8089db48fd0d3d61e0494b2567d87dd711':
  docs: Android TV docs fixes for L SDK release
 2014-10-17 07:50:30 +00:00
Joe Fernandez
e7cc9e8089 Merge "docs: Android TV docs fixes for L SDK release" into lmp-dev 2014-10-17 07:43:02 +00:00
Dan Albert
b973422804 am 69c8d39d: Merge "Clean up unused parameter warnings." 
* commit '69c8d39d1f9ebb55844ad7794d12fedf8b5be5bf':
  Clean up unused parameter warnings.
 2014-10-17 07:38:20 +00:00
Joe Fernandez
7213656f98 docs: Android TV docs fixes for L SDK release 
Change-Id: Ie37c2056844e1c04542ed4e556a6577640e13819
 2014-10-17 00:35:50 -07:00
smain@google.com
b64d987ef3 Merge "add TV quality page to Develop landing carousel" into lmp-dev 
automerge: 4561be0

* commit '4561be01934cdc462570b56afb4c602cbf3295c4':
  add TV quality page to Develop landing carousel
 2014-10-17 07:10:17 +00:00