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

159695 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eino-Ville Talvala
b22de13fdb am df84cb90: Merge "Camera: Add one more requirement to BURST_CAPTURE" into lmp-mr1-dev 
* commit 'df84cb90df6f4a98c853dd61e858f62a584cdac5':
  Camera: Add one more requirement to BURST_CAPTURE
 2014-11-20 22:04:54 +00:00
Jean-Michel Trivi
14b909241f am 09ff9125: Merge "Convert record channel mask for dynamic mix" into lmp-mr1-dev 
* commit '09ff91255e945f2588c377614bf7b7c0d512118e':
  Convert record channel mask for dynamic mix
 2014-11-20 22:04:49 +00:00
Eino-Ville Talvala
df84cb90df Merge "Camera: Add one more requirement to BURST_CAPTURE" into lmp-mr1-dev 2014-11-20 22:03:07 +00:00
Jean-Michel Trivi
09ff91255e Merge "Convert record channel mask for dynamic mix" into lmp-mr1-dev 2014-11-20 22:02:15 +00:00
Chris Craik
5b41215b16 am 93ef9639: Merge "Improve ColorMatrix docs" into lmp-mr1-dev 
* commit '93ef96395a95317bec4f27423ade1ce0d6aa07d8':
  Improve ColorMatrix docs
 2014-11-20 21:41:50 +00:00
Adrian Roos
62a7d53343 am 4e312d81: Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev 
* commit '4e312d81c18b286170c904659e78cab4fdf27200':
  Add device locked API for TrustAgentService
 2014-11-20 21:41:46 +00:00
Adrian Roos
866bae50b7 am af6e657a: Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev 
* commit 'af6e657ab873623ed0e94bc8bcf8ed03f6bbe167':
  Update KeyguardManager.isDeviceLocked API
 2014-11-20 21:41:41 +00:00
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
Craig Mautner
9bb16f55e8 am 25418aab: Merge "Ensure arraylist index is montonically decreasing" into lmp-mr1-dev 
* commit '25418aabb687b39a9e5bbe7c387bfcb81bde1222':
  Ensure arraylist index is montonically decreasing
 2014-11-20 20:57:22 +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
Adrian Roos
50bfeec868 Update KeyguardManager.isDeviceLocked API 
Bug: 18414067
Change-Id: I0715714c2c9a122f578ec0c6f508faae12e6f752
 2014-11-20 21:45:04 +01:00
Eric Rowe
3b442e23d8 am 1d76d397: Merge "Fix wifi reconnection tests." into lmp-mr1-dev 
* commit '1d76d39723c73b14be648a89cb7e6da32b04171c':
  Fix wifi reconnection tests.
 2014-11-20 20:42:53 +00:00
Wink Saville
1caab41f31 am 816e19eb: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev 
* commit '816e19eb6d5795f98f072494c763b20fe3412c30':
  Revert "Additional changes to SubscriptionManager API as per API council."
 2014-11-20 20:38:40 +00: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
68c21d6736 am 4a57e908: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 
* commit '4a57e908177c86819ade1ebb813677698f1a526a':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-20 20:23:17 +00:00
Craig Mautner
8d1ab6f200 am 37983832: Merge "Use package name as custom resolver process name" into lmp-mr1-dev 
* commit '37983832081cd5e825ad2e4151332d0d2fed1533':
  Use package name as custom resolver process name
 2014-11-20 20:23:13 +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
b7ce6d6db1 am 825e0da2: Merge "Fix race when cleaning up receivers/services in Context" into lmp-mr1-dev 
* commit '825e0da22a672ada95da2175bb2d48579bf88a0d':
  Fix race when cleaning up receivers/services in Context
 2014-11-20 20:18:51 +00:00
Eric Rowe
d2fd1bd9d6 am 79de0066: Merge "Fix wifi tethering tests." into lmp-mr1-dev 
* commit '79de00662be774328f4b3598c6effbf49474cc0b':
  Fix wifi tethering tests.
 2014-11-20 20:18:46 +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
Eric Rowe
4902ac4e24 Fix wifi tethering tests. 
Bug: 18418170
Change-Id: Ic3e8b74523c6a8b6003c05258447e9a673541248
 2014-11-20 11:21:54 -08:00
Alan Viverette
a19f057792 am 8ccf071a: Merge "Move default token handling into WindowManagerImpl" into lmp-mr1-dev 
* commit '8ccf071ab83510c8ef7b4d311d894d5c4a352f6c':
  Move default token handling into WindowManagerImpl
 2014-11-20 19:21:11 +00:00
Alan Viverette
05275a2cbd am 93da37a0: Merge "Add padding above and below dialog lists to match Material spec" into lmp-mr1-dev 
* commit '93da37a03b10eaa2971d04e5bbd86b79a154c46a':
  Add padding above and below dialog lists to match Material spec
 2014-11-20 19:21:06 +00: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
12c03e3386 am f66f3052: Merge "TIF: implement gatherTransparentRegion() and dispatchDraw() in TvView." into lmp-mr1-dev 
* commit 'f66f3052a7e99eac436b423280687b84f1ef77d6':
  TIF: implement gatherTransparentRegion() and dispatchDraw() in TvView.
 2014-11-20 19:07:06 +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
91ab2665ed am 52bfa332: Merge "TIF: enhance documentation for TvInputManager.getAvailableStreamConfigs()" into lmp-mr1-dev 
* commit '52bfa3328f076363edb4b5e77f32c8bca2209817':
  TIF: enhance documentation for TvInputManager.getAvailableStreamConfigs()
 2014-11-20 18:54:57 +00:00
Jae Seo
89d8fb555a am 7edaf55a: Merge "TIF: fix setSurface() logic" into lmp-mr1-dev 
* commit '7edaf55aab6fb14a640904015e10e2f5c9299423':
  TIF: fix setSurface() logic
 2014-11-20 18:54:52 +00:00
Winson Chung
de04d5573a am 7c122b60: Merge "Use SystemClock time to keep track of last event times. (Bug 17995039)" into lmp-mr1-dev 
* commit '7c122b60b93c9ef4fa428bc142ea61bf4252b70b':
  Use SystemClock time to keep track of last event times. (Bug 17995039)
 2014-11-20 18:54:47 +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
c2af9be62c am bfab323c: Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-mr1-dev 
* commit 'bfab323cb59f2ff4a1ed64a22a5d0c2434e302c1':
  Setting ADB_ENABLED may result in a SecurityException.
 2014-11-20 18:50:38 +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
42d9bf6655 am a6d2789c: Merge "Add new empty app test entry points." into lmp-mr1-dev 
* commit 'a6d2789c954698f6dca5479b305689d22fc05d80':
  Add new empty app test entry points.
 2014-11-20 18:33:39 +00:00
Dianne Hackborn
42fec57f3a am d9968438: Merge "Fix issue with call backs from media process." into lmp-mr1-dev 
* commit 'd9968438bcf439e7a8c6058a95b85286a632dc1c':
  Fix issue with call backs from media process.
 2014-11-20 18:33:34 +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