157832 Commits

Author SHA1 Message Date
Chris Craik
93ef96395a Merge "Improve ColorMatrix docs" into lmp-mr1-dev 2014-11-20 21:39:47 +00:00
Adrian Roos
4e312d81c1 Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev 2014-11-20 21:38:17 +00:00
Adrian Roos
af6e657ab8 Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev 2014-11-20 21:38:14 +00:00
Chris Craik
db7cc60eb2 Improve ColorMatrix docs
bug:18415632

Clean up some text, and add a sample.

Change-Id: I39fdda2004e1932831058701f95f67355786ad9d
2014-11-20 13:28:01 -08:00
Geoffrey Borggaard
90ed95faed am c3f5d718: Merge "Fix null handling in proxies." into lmp-dev
* commit 'c3f5d7183a21cb081bab1a6bca3fc115523e4e78':
  Fix null handling in proxies.
2014-11-20 20:59:00 +00:00
Geoffrey Borggaard
c3f5d7183a Merge "Fix null handling in proxies." into lmp-dev 2014-11-20 20:55:26 +00:00
Craig Mautner
25418aabb6 Merge "Ensure arraylist index is montonically decreasing" into lmp-mr1-dev 2014-11-20 20:53:36 +00:00
Jean-Michel Trivi
8dc1031453 Convert record channel mask for dynamic mix
When creating the AudioRecord instance for a dynamic mix, convert
  the output channel mask of the mix to an input channel mask
  to be used by the AudioRecord instance through which the
  mixed audio is rerouted.

Bug 16009464

Change-Id: I3addbe85339f6f06b69acc3f9b8e2a765e5d7305
2014-11-20 12:53:23 -08:00
Adrian Roos
481a6df99f Add device locked API for TrustAgentService
Bug: 18414067
Change-Id: I96c68af9ccc9940acf9fab3b5bd39a3485f01045
2014-11-20 21:48:38 +01:00
Christopher Tate
ac6a3a5e9d Recents backup helper
Handles backup/restore of recent tasks for the system.  Currently the
thumbnails are not saved.

At restore time the historical task records are placed in a designated
separate location rather than directly in the live bookkeeping; this
avoids ID duplication issues and makes it easier to deal with lazy
adoption of the historical task state as apps are installed on the
device post-restore.

Bug 17303286
Bug 15986349

Change-Id: Ie156c1e2ab9c9a7e7ac0447b27016fdcef55dded
2014-11-20 12:48:25 -08:00
Adrian Roos
50bfeec868 Update KeyguardManager.isDeviceLocked API
Bug: 18414067
Change-Id: I0715714c2c9a122f578ec0c6f508faae12e6f752
2014-11-20 21:45:04 +01:00
Ricardo Cervera
8837ce2ce3 am e9b5dfc0: am 25bf00bc: docs: Fixes to the Data Layer Wear class.
* commit 'e9b5dfc0588010a97a561d3255ad35d10db000bc':
  docs: Fixes to the Data Layer Wear class.
2014-11-20 20:37:34 +00:00
Ricardo Cervera
161dce465e am c8543b4f: Merge "docs: Fixes to the Data Layer Wear class." into lmp-dev
* commit 'c8543b4f4661902371c16932faa109befb921345':
  docs: Fixes to the Data Layer Wear class.
2014-11-20 20:37:30 +00:00
Jorim Jaggi
d05064b850 Tint SIM images in PIN/PUK screen
Bug: 18147652
Change-Id: Ic077a80883782c228dce0d4537e4c7e5e3caf2b4
2014-11-20 21:36:52 +01:00
Jim Miller
52a6133f4b Add multi-sim support to keyguard
Use new telephony APIs.
Clean up SIM state machine code.
Use cached copy of SubscriptionInfo.
Make SIM PIN and SIM PUK work.

Tested on single and multi-SIM devices.

Fixes bug 18147652

Change-Id: Ic69a4d2898999a5438e6a70b5851705bc05443f1
2014-11-20 21:36:52 +01:00
Eric Rowe
1d76d39723 Merge "Fix wifi reconnection tests." into lmp-mr1-dev 2014-11-20 20:36:44 +00:00
Eric Rowe
ef1a177e6c Fix wifi reconnection tests.
Bug: 18417638
Change-Id: I1710e8b16d4ae1b32317deb0322a98ad45b4e1aa
2014-11-20 12:32:58 -08:00
Wink Saville
816e19eb6d Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev 2014-11-20 20:31:49 +00:00
Wink Saville
2d1ee98227 Revert "Additional changes to SubscriptionManager API as per API council."
This reverts commit baf21da1e17ef358632c078128d381b3be218a08.

Change-Id: I73cbdfadf07ca3cf20b042781b62aafcc72b17d6
2014-11-20 20:29:51 +00:00
Wink Saville
4a57e90817 Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 2014-11-20 20:20:02 +00:00
Craig Mautner
3798383208 Merge "Use package name as custom resolver process name" into lmp-mr1-dev 2014-11-20 20:19:04 +00:00
Adam Lesinski
825e0da22a Merge "Fix race when cleaning up receivers/services in Context" into lmp-mr1-dev 2014-11-20 20:13:54 +00:00
Craig Mautner
7b4655dbbe Ensure arraylist index is montonically decreasing
A previous fix for IndexOutOfBoundsException (ag/584621) left a
situation where the index would not decrement if the arraylist
size didn't change. The size doesn't change if the window being
removed is animating away. That caused window manager to remain
in an infinite loop within removeAllWindows.

This change ensures that the index diminishes each pass through
the loop and doesn't exceed the bounds of the arraylist.

Fixes bug 18362246.

Change-Id: Ibca70d95622f3b152ede14857f0e913099dc7b88
2014-11-20 12:13:22 -08:00
Eric Rowe
79de00662b Merge "Fix wifi tethering tests." into lmp-mr1-dev 2014-11-20 20:12:53 +00:00
Adam Lesinski
23d40c40aa Fix race when cleaning up receivers/services in Context
Bug:18135575
Change-Id: I2c69c8189d9ebd297c8a83fe84658b26cbb0528f
2014-11-20 12:00:52 -08:00
Ricardo Cervera
e9b5dfc058 am 25bf00bc: docs: Fixes to the Data Layer Wear class.
* commit '25bf00bceed5b22f8750e68a45beb944a80773a8':
  docs: Fixes to the Data Layer Wear class.
2014-11-20 19:56:11 +00:00
Ricardo Cervera
25bf00bcee docs: Fixes to the Data Layer Wear class.
Bug: 17917638
Bug: 17917145
Bug: 17931937
Bug: 17933032
Bug: 16899307

Change-Id: Iee9fd0a44cd40b9860cf242cbdaabac409882a15
(cherry picked from commit eff209d2c40221d2f9be2fd6b0c9cde51dd5362b)
2014-11-20 19:51:25 +00:00
Ricardo Cervera
c8543b4f46 Merge "docs: Fixes to the Data Layer Wear class." into lmp-dev 2014-11-20 19:49:53 +00:00
Geoffrey Borggaard
79adc958e5 Fix null handling in proxies.
ProxyInfo.getPacFileUrl() can not be null.  It will be equal to
Uri.EMPTY.  Checking for null was causing global proxies to never be
disabled.  Or more accurately, global proxies would be disabled, but
would reappear after a reboot.

ProxyInfo.getExclusionListByString() can be null.  If no
exclusion list was specified, the proxy settings would not be
successfully saved, they would disappear after reboot.

Bug: 18453223
Change-Id: I1c27e5dca5b9664bb7468ea909bff489fa110a07
2014-11-20 19:48:20 +00:00
Ruben Brunk
f721ba0463 Camera2: Doc updates for aeExposureCompensation.
Bug: 18467471

Change-Id: I3c270c535fa5e7f3eb40bd699898a759c07d986b
2014-11-20 11:46:36 -08:00
Eric Rowe
4902ac4e24 Fix wifi tethering tests.
Bug: 18418170
Change-Id: Ic3e8b74523c6a8b6003c05258447e9a673541248
2014-11-20 11:21:54 -08:00
Alan Viverette
8ccf071ab8 Merge "Move default token handling into WindowManagerImpl" into lmp-mr1-dev 2014-11-20 19:16:58 +00:00
Alan Viverette
93da37a03b Merge "Add padding above and below dialog lists to match Material spec" into lmp-mr1-dev 2014-11-20 19:16:25 +00:00
Jae Seo
f66f3052a7 Merge "TIF: implement gatherTransparentRegion() and dispatchDraw() in TvView." into lmp-mr1-dev 2014-11-20 19:03:03 +00:00
Jae Seo
52bfa3328f Merge "TIF: enhance documentation for TvInputManager.getAvailableStreamConfigs()" into lmp-mr1-dev 2014-11-20 18:52:16 +00:00
Jae Seo
7edaf55aab Merge "TIF: fix setSurface() logic" into lmp-mr1-dev 2014-11-20 18:51:32 +00:00
Winson Chung
7c122b60b9 Merge "Use SystemClock time to keep track of last event times. (Bug 17995039)" into lmp-mr1-dev 2014-11-20 18:50:50 +00:00
Geoffrey Borggaard
bfab323cb5 Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-mr1-dev 2014-11-20 18:44:49 +00:00
Dianne Hackborn
a6d2789c95 Merge "Add new empty app test entry points." into lmp-mr1-dev 2014-11-20 18:29:28 +00:00
Dianne Hackborn
d9968438bc Merge "Fix issue with call backs from media process." into lmp-mr1-dev 2014-11-20 18:29:15 +00:00
Martijn Coenen
2bf6529bf8 Merge "Verify NFC permission immediately on API calls." into lmp-mr1-dev 2014-11-20 17:59:24 +00:00
RoboErik
ac4af18bbb Merge "Handle volume events on master volume devices correctly" into lmp-mr1-dev 2014-11-20 17:59:14 +00:00
RoboErik
5b881d43ec Merge "Scale bitmaps in metadata sent to the system" into lmp-mr1-dev 2014-11-20 17:58:36 +00:00
Shishir Agrawal
a9b6777154 Merge "Carrierprivileges: Addressing API council suggestions." into lmp-mr1-dev 2014-11-20 17:44:36 +00:00
Chris Craik
3b2ba44be3 Merge "Improve logging around performance critical events" into lmp-mr1-dev 2014-11-20 17:36:26 +00:00
Jorim Jaggi
bf1960ce9c Merge "Fade notifications when exiting dozing" into lmp-mr1-dev 2014-11-20 17:25:49 +00:00
Selim Cinek
b18cbb9a19 Merge "Fixed a bug where the notifications were not animating" into lmp-mr1-dev 2014-11-20 17:01:24 +00:00
Filip Gruszczynski
96c5d37fb5 Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev 2014-11-20 15:51:09 +00:00
Geoffrey Borggaard
b66252fb42 Setting ADB_ENABLED may result in a SecurityException.
If the restriction UserManager.DISALLOW_DEBUGGING_FEATURES is enforced,
then any attempt to set ADB_ENABLED will result in a SecurityException.
This can result in the device not being able to boot.
Bug: 18433477

Change-Id: I21e4b406ad0fa89b7d4b678eac1baf212a3c7acd
(cherry picked from commit ba45b96a378623e3392da65e81e67dabdf4f0678)
2014-11-20 15:39:23 +00:00
John Reck
b13de07f0b If the surface is lost, release it
Bug: 18403246

Surface#isValid() is used throughout ViewRootImpl to
determine Surface validity. However, this will return true
until Surface#release() is called, even if the underlying
BufferQueue is abandoned. We have a very strong signal
from EGL that the Surface is now dead, so use that signal
to call Surface#release() so ViewRootImpl's isValid() usage
will be valid.

Change-Id: Ib355560ef4ca7625c3c784174863d2d55267d93d
2014-11-20 07:38:00 -08:00