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

153817 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eino-Ville Talvala
33bf20f3ef am 0d09fda1: am 4046697e: am 579442e8: Merge "Camera2: Correct error handling" into lmp-dev 
* commit '0d09fda101e557f2e8894746d14f8a190f2a1af0':
  Camera2: Correct error handling
 2014-08-27 21:51:05 +00:00
Eric Laurent
6c104d84c3 Merge "fix condition to send ACTION_AUDIO_BECOMING_NOISY intent" into lmp-dev 2014-08-27 21:47:11 +00:00
Jim Miller
8730bdf76c am c5cabe2d: Merge "Hide trust agent whitelisting until new API is ready." into lmp-dev 
* commit 'c5cabe2d00450cb18f856618260e0fa7d780452b':
  Hide trust agent whitelisting until new API is ready.
 2014-08-27 21:44:15 +00:00
Sascha Prueter
e6295fdb30 am a64ecf44: am 10651214: Merge "Add null check to cleanupRecentTasksLocked." into lmp-dev 
* commit 'a64ecf44914f8654cf983cde4298df283ccf8f15':
  Add null check to cleanupRecentTasksLocked.
 2014-08-27 21:43:47 +00:00
Michael Wright
0a4314c468 am 29969105: am ca95dc97: Merge "Allow voice assist to function in a non-interactive state" into lmp-dev 
* commit '2996910596cd6d71637f8c38f57a6ced0cc77963':
  Allow voice assist to function in a non-interactive state
 2014-08-27 21:43:42 +00:00
Jim Miller
bb22e2a7a4 am 56c0e1db: am 61043233: Merge "Change name of confirm credentials method after API review" into lmp-dev 
* commit '56c0e1db523779ee7856ac196b7370b7433142b3':
  Change name of confirm credentials method after API review
 2014-08-27 21:36:53 +00:00
Winson Chung
275720fe43 am 1e1c328f: am 4de668bc: Merge "Additional changes to improve performance when loading Recents. (Bug 16987565)" into lmp-dev 
* commit '1e1c328f9e9605e8eed1e9729067dfd702fb4f81':
  Additional changes to improve performance when loading Recents. (Bug 16987565)
 2014-08-27 21:36:24 +00:00
Alan Viverette
6d2f4977e0 am f467b7c0: am 738aeaf4: Merge "Fix NPE in RippleDrawable" into lmp-dev 
* commit 'f467b7c0e434902a48d9c459c4d4de0279e8f160':
  Fix NPE in RippleDrawable
 2014-08-27 21:36:18 +00:00
Alan Viverette
66d9747da1 am 7d5bbea6: am 11e73661: Merge "Rename Spinner.Form to Spinner.Underlined, make Alert theme public" into lmp-dev 
* commit '7d5bbea6bf76a705cd9d6d3d0cdfad18169440bf':
  Rename Spinner.Form to Spinner.Underlined, make Alert theme public
 2014-08-27 21:36:12 +00:00
John Spurlock
2f47f7fc40 am 8354e284: am 98a354d4: Merge "Doze: Null check in NotificationContentView.mContractedChild." into lmp-dev 
* commit '8354e2846d962b054c85832b62b621bd8ae1ff48':
  Doze: Null check in NotificationContentView.mContractedChild.
 2014-08-27 21:35:55 +00:00
Eino-Ville Talvala
bf8a6d77b0 am 4046697e: am 579442e8: Merge "Camera2: Correct error handling" into lmp-dev 
* commit '4046697e3a6b409e8bcd76a06b3d457814c8f444':
  Camera2: Correct error handling
 2014-08-27 21:35:42 +00:00
Jim Miller
e193455ee2 Merge "Hide trust agent whitelisting until new API is ready." into lmp-dev 2014-08-27 21:29:12 +00:00
Jim Miller
b1474f4432 Hide trust agent whitelisting until new API is ready. 
Fixes bug 17008504

Change-Id: Ic93d52042e9b6d6f7d634f22aa04642f2da1af32
 2014-08-27 14:27:49 -07:00
Sascha Prueter
06114b582c am 10651214: Merge "Add null check to cleanupRecentTasksLocked." into lmp-dev 
* commit '10651214051b921da4c0b01d1825c84906cd8c53':
  Add null check to cleanupRecentTasksLocked.
 2014-08-27 21:26:55 +00:00
Michael Wright
901098ab06 am ca95dc97: Merge "Allow voice assist to function in a non-interactive state" into lmp-dev 
* commit 'ca95dc97a64a5b69c5bb4cce62590c335dfe5d71':
  Allow voice assist to function in a non-interactive state
 2014-08-27 21:26:50 +00:00
Sascha Prueter
b655e756a0 Merge "Add null check to cleanupRecentTasksLocked." into lmp-dev 2014-08-27 21:18:34 +00:00
Michael Wright
3cb3e8b92f Merge "Allow voice assist to function in a non-interactive state" into lmp-dev 2014-08-27 21:16:34 +00:00
Jae Seo
cfd861ec15 Add android.software.live_tv feature 
This feature will be listed by Android TV devices that allow displaying
contents from TV inputs implemented with the
android.media.tv.TvInputService API. (Note that not all leanback devices
support this feature.)

Bug: 17284986
Change-Id: Ic1f23f6f5955866e9f1db9229693d370576066a3
 2014-08-27 14:02:15 -07:00
Craig Mautner
53dc7eac05 Add null check to cleanupRecentTasksLocked. 
If during boot, the package manager broadcast occurs before
TaskPersister has restored the recents list then mRecentTasks will be
null and an NPE will occur. This checks for null mRecentsTasks and
returns before the NPE happens.

Fixes bug 17300409.

Change-Id: I1588ad3a3c0d04bc6f273630ef5dadf6821e5710
 2014-08-27 14:01:25 -07:00
Jim Miller
c80aaf38ab am 61043233: Merge "Change name of confirm credentials method after API review" into lmp-dev 
* commit '6104323343861e1d1edc586e19f2fdece3025065':
  Change name of confirm credentials method after API review
 2014-08-27 20:57:32 +00:00
Christopher Tate
674d3e7501 Do not require device provisioning to do restore-at-install 
Provisioning is a milestone used for gating *backup* operation,
but it's important that restores be possible during the setup
process.  In particular, some applications such as home apps may
be deliberately pushed for install after platform restore, but
before the end of the setup process.  We need to be able to do
install-time restores of such apps.

Bug 17288313

Change-Id: Iaff5d9919e6392b2ca5925be4d63a4116cd11f77
 2014-08-27 13:54:51 -07:00
Tim Kilbourn
fe69d6e28c Update leanback shadow parameters. 
Bug: 15859361
Change-Id: I54d184cdf72de98aa0d258774f772f874c6d0490
 2014-08-27 13:54:00 -07:00
Jim Miller
f88c2569e9 Merge "Change name of confirm credentials method after API review" into lmp-dev 2014-08-27 20:42:19 +00:00
Winson Chung
94424fe8fb am 4de668bc: Merge "Additional changes to improve performance when loading Recents. (Bug 16987565)" into lmp-dev 
* commit '4de668bcb1a03e505e585d43b080029aa2780e5d':
  Additional changes to improve performance when loading Recents. (Bug 16987565)
 2014-08-27 20:17:22 +00:00
Alan Viverette
39698e77a4 am 738aeaf4: Merge "Fix NPE in RippleDrawable" into lmp-dev 
* commit '738aeaf442e0d7928dc795b726a5fac034471d94':
  Fix NPE in RippleDrawable
 2014-08-27 20:11:46 +00:00
Winson Chung
3e97f9d48b Merge "Additional changes to improve performance when loading Recents. (Bug 16987565)" into lmp-dev 2014-08-27 20:09:57 +00:00
Alan Viverette
719da6ba9b Merge "Fix NPE in RippleDrawable" into lmp-dev 2014-08-27 20:04:28 +00:00
Alan Viverette
52315cf17f am 11e73661: Merge "Rename Spinner.Form to Spinner.Underlined, make Alert theme public" into lmp-dev 
* commit '11e73661d71e8616b502f800eca9a7985115e898':
  Rename Spinner.Form to Spinner.Underlined, make Alert theme public
 2014-08-27 19:57:54 +00:00
Alan Viverette
12c75ab730 Merge "Rename Spinner.Form to Spinner.Underlined, make Alert theme public" into lmp-dev 2014-08-27 19:44:37 +00:00
Eric Laurent
27c30e4426 fix condition to send ACTION_AUDIO_BECOMING_NOISY intent 
In checkSendBecomingNoisyIntent(), only output devices
must be taken into account when checking if the device
type is in mBecomingNoisyIntentDevices

Bug: 17298383.
Bug: 16403219.
Change-Id: I2213681184ab9fb3b874029143f2bbd34032d6b8
 2014-08-27 12:36:33 -07:00
Alan Viverette
d890c13981 Rename Spinner.Form to Spinner.Underlined, make Alert theme public 
BUG: 17286794
BUG: 17295515
Change-Id: I010bb1591f7690dbc40020d3fdd413f8e1bd8547
 2014-08-27 12:28:18 -07:00
John Spurlock
2b0dcd43db am 98a354d4: Merge "Doze: Null check in NotificationContentView.mContractedChild." into lmp-dev 
* commit '98a354d4619cc90bd0ef3417fbe2bc9165d4496d':
  Doze: Null check in NotificationContentView.mContractedChild.
 2014-08-27 19:25:30 +00:00
John Spurlock
2cd88d7512 Merge "Doze: Null check in NotificationContentView.mContractedChild." into lmp-dev 2014-08-27 19:15:03 +00:00
Winson Chung
ebfc698182 Additional changes to improve performance when loading Recents. (Bug 16987565) 
- Ensuring that we consistently load activity icon, title and color for both full and shallow stacks
- Adding activity info caches when loading the stacks
- Should not be scaling pin icon when launching from pin
- Tweaking snap-back, over scroll, and shadows

Change-Id: I556b93562bb2c69e4c25ce787a7a34532ab706ca
 2014-08-27 19:07:36 +00:00
Eino-Ville Talvala
e7f72cca40 am 579442e8: Merge "Camera2: Correct error handling" into lmp-dev 
* commit '579442e87e9737f424663d01e163cbc23b1346d1':
  Camera2: Correct error handling
 2014-08-27 18:58:42 +00:00
John Spurlock
c3dfd32843 Doze: Null check in NotificationContentView.mContractedChild. 
Bug: 17247547
Change-Id: Iede5d0cd88db4e293e583f3a3c324354eb6d594e
 2014-08-27 14:55:54 -04:00
Jean-Michel Trivi
d0ce27a698 am 3fcc7935: am c313bbcb: am 24562d7e: Merge "SoundPool.Builder: document default values" into lmp-dev 
* commit '3fcc7935df26183ce38a64532e2e86a1ec41d47c':
  SoundPool.Builder: document default values
 2014-08-27 18:49:47 +00:00
Eino-Ville Talvala
2227cac5af Merge "Camera2: Correct error handling" into lmp-dev 2014-08-27 18:47:30 +00:00
Jean-Michel Trivi
c7676bb390 am c313bbcb: am 24562d7e: Merge "SoundPool.Builder: document default values" into lmp-dev 
* commit 'c313bbcbd313d682a23ea0cce99be3d1b3da6624':
  SoundPool.Builder: document default values
 2014-08-27 18:41:36 +00:00
Jeff Sharkey
045a7a9b89 am 22f9b2a9: am 542a7796: am 37589a33: Merge "Recreate lib symlink after deleting app data." into lmp-dev 
* commit '22f9b2a9d1256f0ea397f12b4e3095fddcf4da7d':
  Recreate lib symlink after deleting app data.
 2014-08-27 18:30:40 +00:00
Jeff Sharkey
71629cd9d0 am 3b7af7c4: am bfe28603: am 31d0207a: Merge "Clear pending operation flag when move failed." into lmp-dev 
* commit '3b7af7c4ec06d73c9a22c96cb8f78a71f7e67b73':
  Clear pending operation flag when move failed.
 2014-08-27 18:30:30 +00:00
Jean-Michel Trivi
acf19975d2 am 24562d7e: Merge "SoundPool.Builder: document default values" into lmp-dev 
* commit '24562d7e5c73c6be3225eff1f53ca4ffa94f09e0':
  SoundPool.Builder: document default values
 2014-08-27 18:29:36 +00:00
Jean-Michel Trivi
c0dce273a8 Merge "SoundPool.Builder: document default values" into lmp-dev 2014-08-27 18:23:00 +00:00
Jeff Sharkey
b80fa969e6 am 542a7796: am 37589a33: Merge "Recreate lib symlink after deleting app data." into lmp-dev 
* commit '542a77966963147f7b8d4705275628737fa176a0':
  Recreate lib symlink after deleting app data.
 2014-08-27 18:21:48 +00:00
Jeff Sharkey
5bb8bc4754 am bfe28603: am 31d0207a: Merge "Clear pending operation flag when move failed." into lmp-dev 
* commit 'bfe28603b7ac6a5faf071fe30bbd1c9272fc69e3':
  Clear pending operation flag when move failed.
 2014-08-27 18:21:43 +00:00
Amith Yamasani
61819d4552 am 22a11865: am 8f3e59d6: am e656975c: Merge "Fix incorrect reading of multichoice app restrictions" into lmp-dev 
* commit '22a11865cd6b6aa211217cec070343ad69ffc9a8':
  Fix incorrect reading of multichoice app restrictions
 2014-08-27 18:17:55 +00:00
Eino-Ville Talvala
acc0095bc8 Camera2: Correct error handling 
- Report capture failures from service to application
- Only go to error state for device-level errors
- Adjust binder interface method names to match the service side names
- Reduce failed session creation logging
- Don't fire CaptureSession.onActive for CameraDevice.onBusy
- Check with session to determine capture failure reason

Bug: 17160301
Bug: 15524101
Bug: 14448494
Bug: 11272459

Change-Id: I9dd606004fd7845910dc865738fbe17f1640f07d
 2014-08-27 11:08:18 -07:00
Craig Mautner
8c458e2f95 am 273355f2: am ece9e05d: am b46e78f9: Merge "Revert "Debug for 13924095."" into lmp-dev 
* commit '273355f25f7adb4b4302bdf2bccb04fc49ded9a3':
  Revert "Debug for 13924095."
 2014-08-27 18:08:09 +00:00
Amith Yamasani
1c9a6a965c am 8f3e59d6: am e656975c: Merge "Fix incorrect reading of multichoice app restrictions" into lmp-dev 
* commit '8f3e59d674c1766e1566f7b28ebbe175aacdc19e':
  Fix incorrect reading of multichoice app restrictions
 2014-08-27 18:07:42 +00:00
Jeff Sharkey
73306fda9d am 37589a33: Merge "Recreate lib symlink after deleting app data." into lmp-dev 
* commit '37589a33e8abb534b931b0246143c85f5b4fbb75':
  Recreate lib symlink after deleting app data.
 2014-08-27 18:05:33 +00:00