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

146647 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Davidson
4aa7a0d8f6 am ebc1f37f: Merge "Add NetworkScoreManager.disableScoring()." into lmp-dev 
* commit 'ebc1f37ff05014a63187133fa280a850ce5ccada':
  Add NetworkScoreManager.disableScoring().
 2014-07-29 23:17:46 +00:00
Jinsuk Kim
1279f47baa am 8b964025: Invoke input change listener at path change 
* commit '8b96402512d163c042248ccf19f9a79274eabf84':
  Invoke input change listener at path change
 2014-07-29 23:17:42 +00:00
Yuncheol Heo
9a6807468d am 6fa5476a: Make it pass CECT 11.1.3 System standby 
* commit '6fa5476a6b0462824ff7c3af48db8787c10bb5a9':
  Make it pass CECT 11.1.3 System standby
 2014-07-29 23:17:33 +00:00
Jinsuk Kim
43c23e273e Invoke input change listener at path change 
Previously input change listener is not invoked if the routing change
does not cause the TV port change, but this failed to trigger the change
from an active source connected to port 1 to a non-cec device also
connected to port 1. Do this by comparing paths not ports.

Also did some cleanup:
- Avoid allocating empty lists too often for getActions
- ActiveSource.invalidate()

Change-Id: Id79531e2552ef7fa38bd604796108b8650db69a1
 2014-07-29 22:57:52 +00:00
Yuncheol Heo
26ba7fddca Make it pass CECT 11.1.3 System standby 
- Accept the broadcast <Standby> message.
- Fix the bug that onStandyCompleted() is called mutliple times.
- Fix the issue that <Standby> message is not sent when going to
  the standby state, since the local device was cleared already.

Bug: 16497304
Change-Id: Ib04ad2386621929814a801edd6b6c0e1a3902a7c
 2014-07-30 07:55:39 +09:00
Jinsuk Kim
39affc9de3 am 78aaab20: Merge "Send TV app the intent for the new active source" into lmp-dev 
* commit '78aaab2009fc1ca9eb28c929575e2ad25fd14dfb':
  Send TV app the intent for the new active source
 2014-07-29 22:49:39 +00:00
Ihab Awad
6e550acc31 am 4290e4eb: Merge "Connection creation and service wiring for WiFi call managers (1/3)" into lmp-dev 
* commit '4290e4eb288360b8dae8e06bcb9054533c6eaee8':
  Connection creation and service wiring for WiFi call managers (1/3)
 2014-07-29 22:49:35 +00:00
Igor Murashkin
32fb9f06ef am 3387fffa: Merge "camera2: legacy: Don\'t set the @hide frame number metadata" into lmp-dev 
* commit '3387fffa3cf94106f9887f6accc06bc52dc5739f':
  camera2: legacy: Don't set the @hide frame number metadata
 2014-07-29 22:25:54 +00:00
Igor Murashkin
bf9cea2b09 am 92f2d610: Merge "camera2: Api change (#getFrameNumber -> long; @hide REQUEST_FRAME_COUNT)" into lmp-dev 
* commit '92f2d610329acb17ed6f94a6361a7ad5e12ecf21':
  camera2: Api change (#getFrameNumber -> long; @hide REQUEST_FRAME_COUNT)
 2014-07-29 22:16:55 +00:00
Jorim Jaggi
748c1283f2 am 5c2d0ab8: Optimize alpha handling for stack scroller 
* commit '5c2d0ab85ab3e64718cc50c17346bdeab4486f4a':
  Optimize alpha handling for stack scroller
 2014-07-29 22:12:51 +00:00
Jorim Jaggi
5ad92c5278 Optimize alpha handling for stack scroller 
Use a layer when an alpha is set. Currently, this breaks shadows
when alpha != 1f, however, b/15860114 will fix this.

Change-Id: I094d5896a5433ba9a0ecc17549ef2944f6b7881e
 2014-07-29 22:07:21 +00:00
Igor Murashkin
5283599323 am 6dc35134: Merge changes I104c8243,I82811142 into lmp-dev 
* commit '6dc351346931bece1eb0c620ca8e7406ee748a81':
  camera2: legacy: fix cached results bug and fix focus modes
  camera2: legacy: Add focus support
 2014-07-29 21:59:50 +00:00
Igor Murashkin
3676164462 Merge "camera2: Api change (#getFrameNumber -> long; @hide REQUEST_FRAME_COUNT)" into lmp-dev 2014-07-29 21:36:00 +00:00
Igor Murashkin
bdf366cc70 camera2: Api change (#getFrameNumber -> long; @hide REQUEST_FRAME_COUNT) 
Change-Id: I164011c97a57fb9fb9c504ae4c5f394dcb36a4bc
 2014-07-29 15:09:45 -07:00
Igor Murashkin
3a3eb15741 camera2: legacy: fix cached results bug and fix focus modes 
- Also add request.frameCounter and request.pipelineDepth results

Change-Id: I104c8243fa525622cb4ab7b5535cbca8588862f3
 2014-07-29 14:23:27 -07:00
Igor Murashkin
83d8639e90 camera2: legacy: Add focus support 
* Characteristics will list control.availableAfModes
* Request/result for control.afMode and control.afState

(Does not yet support control.afRegions)

Change-Id: I828111425fa587114d5159f7fb2b1e53a2c74e61
 2014-07-29 14:20:41 -07:00
Robert Shih
8dae90ccd2 am 6550f08a: Merge "MediaPlayer: scanInternalSubtitleTracks in synchronous prepare" into lmp-dev 
* commit '6550f08a0bf0c0c3e8317b285e844d928e9ae7e2':
  MediaPlayer: scanInternalSubtitleTracks in synchronous prepare
 2014-07-29 21:10:55 +00:00
Robert Shih
0d80c63982 am 39c21c83: Merge "MediaPlayer: support external timed text in java" into lmp-dev 
* commit '39c21c83089961aa603272decdf3b179a5cdd063':
  MediaPlayer: support external timed text in java
 2014-07-29 21:10:50 +00:00
Christopher Tate
7ec0b01267 am f7d8c491: Merge "Make archive metadata idempotent" into lmp-dev 
* commit 'f7d8c4917f5df8d583c988042c1c9770556ae757':
  Make archive metadata idempotent
 2014-07-29 21:10:45 +00:00
Prerepa Viswanadham
821fb9e8d4 am d5359a8e: Fix crash in Stopping/Starting BLE advertising after BluetoothAdapter cycling 
* commit 'd5359a8ec08646fb0c82a003550dda908efa2045':
  Fix crash in Stopping/Starting BLE advertising after BluetoothAdapter cycling
 2014-07-29 21:10:40 +00:00
Prerepa Viswanadham
f6b3d8ca36 Fix crash in Stopping/Starting BLE advertising after 
BluetoothAdapter cycling

Bug 16528460
Change-Id: Iad852bc93d307c5ca5f7e42f24248aa02c105e8a
 2014-07-29 21:06:29 +00:00
Jon Miranda
cbaad7d070 am 1f4a4791: Merge "Exposed getLocationOnScreen, added formatToHexString method." into lmp-dev 
* commit '1f4a4791d07d231c16dfcfbbea56eaf6049c3818':
  Exposed getLocationOnScreen, added formatToHexString method.
 2014-07-29 20:55:26 +00:00
Michael Wright
6f7f3a7c3c am f277aa69: Add paragraph tags to MediaProjection docs 
* commit 'f277aa69c395b6294a88ed60857508f6915aa718':
  Add paragraph tags to MediaProjection docs
 2014-07-29 20:51:26 +00:00
Sandeep Siddhartha
307e8ffac5 am cd18dde8: Merge "Use keyphrase id from the recognition event" into lmp-dev 
* commit 'cd18dde8ad1b15415909451da5d100cfe80500ea':
  Use keyphrase id from the recognition event
 2014-07-29 20:47:29 +00:00
Michael Wright
9469cdde2c Add paragraph tags to MediaProjection docs 
Change-Id: Ia881f9bcf3b93bd699f9ddf80d51ec7d0e74d2ed
 2014-07-29 20:46:40 +00:00
Andrew Lee
c94c230d06 am 7b20dedf: Merge "Convert VideoState into an inner class." into lmp-dev 
* commit '7b20dedfc0e204cc7ba7efae0ccc45576a6231ba':
  Convert VideoState into an inner class.
 2014-07-29 20:41:44 +00:00
Adrian Roos
036a5e4497 am b64bbc56: Fix checkbuild 
* commit 'b64bbc56e6222a9d8586947981e1243ab37732f2':
  Fix checkbuild
 2014-07-29 20:35:24 +00:00
Adrian Roos
489d2dfc29 Fix checkbuild 
Change-Id: I9c3de31af792863b93a29ef81b50e2149b0a2184
 2014-07-29 20:30:50 +00:00
Alan Viverette
af0bb09864 am 9bbfa2a3: Merge "Clean up TimePicker and DatePicker styling" into lmp-dev 
* commit '9bbfa2a39cc1df1ae17e0bc82921b5bcb0b0e688':
  Clean up TimePicker and DatePicker styling
 2014-07-29 20:16:09 +00:00
Dake Gu
cae55dd97f am ebf01ef4: Merge "Transition: Don\'t suppressLayout(false) for returning activity" into lmp-dev 
* commit 'ebf01ef4f9e6d838ef16909d5449fd381009a2a0':
  Transition: Don't suppressLayout(false) for returning activity
 2014-07-29 19:54:26 +00:00
vandwalle
6f278839fd am 6a161751: Merge "record join attempts" into lmp-dev 
* commit '6a161751250caa5aae16124e2593e0a120dc2a36':
  record join attempts
 2014-07-29 19:46:02 +00:00
Jean-Michel Trivi
1713a1180f am bd89caa8: Optional AudioService debug logs for setMode() 
* commit 'bd89caa83defb0593757792d9a1df80a15b6878c':
  Optional AudioService debug logs for setMode()
 2014-07-29 19:32:02 +00:00
Jean-Michel Trivi
339567d5c9 Optional AudioService debug logs for setMode() 
Add log option to help debug routing / volume issues due to
  improper use of audio mode.

Change-Id: I6c2dde61b6b42ea9b45825ba7e10a17a61991c98
 2014-07-29 19:25:58 +00:00
Behdad Esfahbod
64f81f158f am da5c8cd0: Merge "Use new minikin Layout::doLayout() that doesn\'t use a CSS string" into lmp-dev 
* commit 'da5c8cd0c7b7a87775952293f430f81e6a28c488':
  Use new minikin Layout::doLayout() that doesn't use a CSS string
 2014-07-29 19:04:25 +00:00
Alan Viverette
3f3802c39c am e89c4031: Merge "Partial revert "Add better errors for unresolved attributes, remove unused code"" into lmp-dev 
* commit 'e89c403128b2cf9dc36eefdc47ada91780cdcb1c':
  Partial revert "Add better errors for unresolved attributes, remove unused code"
 2014-07-29 18:33:56 +00:00
Sandeep Siddhartha
e288321f9d am d3fd7b40: Read the keyphrase ID from the recognition event 
* commit 'd3fd7b4098c56f9cf52722e4a7c6817b2345b181':
  Read the keyphrase ID from the recognition event
 2014-07-29 18:27:48 +00:00
Sandeep Siddhartha
6817337118 Read the keyphrase ID from the recognition event 
Bug: 16516658
Change-Id: Ibeee81c9543aa1091bb075066cfc2269107f13c0
 2014-07-29 11:24:51 -07:00
Matthew Williams
aa2119aab8 am bd8038b8: Merge "remove possible JobScheduler race in cancel()" into lmp-dev 
* commit 'bd8038b854845121d52a991640c5f61ecc3690bc':
  remove possible JobScheduler race in cancel()
 2014-07-29 18:21:29 +00:00
Jean-Michel Trivi
0d69b13258 am 6e7eb4d5: Restore missing usage assignment in AudioAttributes 
* commit '6e7eb4d5e768b6f16a806755ba84e0995f70259b':
  Restore missing usage assignment in AudioAttributes
 2014-07-29 18:21:23 +00:00
Jean-Michel Trivi
c1601f73b9 Restore missing usage assignment in AudioAttributes 
A bad merge caused the usage field assignment in
  setLegacyStreamType() to disappear. Restore it.

Change-Id: I2c72e09a2c4a394483b8a4521b72d5edcc346e23
 2014-07-29 18:14:21 +00:00
Jorim Jaggi
7e64e16afa am b73f79b4: Fix crash in ExpandHelper 
* commit 'b73f79b4517a77e550249b1da523fa1d7b9323fa':
  Fix crash in ExpandHelper
 2014-07-29 18:12:09 +00:00
Jorim Jaggi
c503896a4d Fix crash in ExpandHelper 
Bug: 16645584
Change-Id: Ifbcd8c88cda0a390061c162aa43d8615d1311f19
 2014-07-29 18:06:55 +00:00
Jason Monk
c7910af727 am 9e9b5c70: Merge "Fix incorrect Activity#startLockTask doc" into lmp-dev 
* commit '9e9b5c70c94ed06e2d6195a3503632b312581c0e':
  Fix incorrect Activity#startLockTask doc
 2014-07-29 18:03:58 +00:00
Chris Craik
655168fe34 am 7c51cf6c: Merge "Fix behavior of stencil clipping within clearLayerRegions" into lmp-dev 
* commit '7c51cf6c819291d01c67137de8233692ce78e3e7':
  Fix behavior of stencil clipping within clearLayerRegions
 2014-07-29 17:52:27 +00:00
Adam Lesinski
ccc00a3002 am cea9bbd5: Ensure the ResTable data is at least the size of a ResTable_header 
* commit 'cea9bbd5b854acaad298329ad2c038ad39f4357f':
  Ensure the ResTable data is at least the size of a ResTable_header
 2014-07-29 17:48:13 +00:00
Alan Viverette
15b564fcd4 am 491edeb4: Merge "Don\'t double-cancel the active ripple" into lmp-dev 
* commit '491edeb443021b04bd8125fc391941caf28a58b0':
  Don't double-cancel the active ripple
 2014-07-29 17:44:08 +00:00
Alan Viverette
75a79a467f am 936ee391: Merge "Add better errors for unresolved attributes, remove unused code" into lmp-dev 
* commit '936ee391d1e776f16be7cf3b9f981e5e0978efb2':
  Add better errors for unresolved attributes, remove unused code
 2014-07-29 17:44:03 +00:00
Adam Lesinski
f28d505dc5 Ensure the ResTable data is at least the size of a ResTable_header 
Change-Id: Ib8d5574bd6a125797a582837987332e66721e84d
 2014-07-29 17:42:34 +00:00
Adam Lesinski
64c81f72a1 am 2420fb3e: Merge "Have AEP GL feature depend on GLES 3.1 in badging" into lmp-dev 
* commit '2420fb3e9dab2b57a4c7028f922073b779dd857d':
  Have AEP GL feature depend on GLES 3.1 in badging
 2014-07-29 17:39:54 +00:00
John Reck
a0d86abce1 am 4be69bc5: Merge "Add layer/texture creation tracing" into lmp-dev 
* commit '4be69bc56c4b9a7f9d197704c743e895daf1b183':
  Add layer/texture creation tracing
 2014-07-29 17:24:30 +00:00