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

150326 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jae Seo
1e25b1f8a8 am caf3c12c: Merge "API review: android.media.tv" into lmp-dev 
* commit 'caf3c12ca1ee420acdbb0181ffe5a0497ce84af3':
  API review: android.media.tv
 2014-09-05 21:05:23 +00:00
Aravind Akella
65e74377d9 am 6a7a06ee: Merge "Documentation fix for Sensor.getMaxDelay()" into lmp-dev 
* commit '6a7a06ee74ec3c63a4096be5bf2e3d18c9867170':
  Documentation fix for Sensor.getMaxDelay()
 2014-09-05 21:05:19 +00:00
Jim Miller
9e349078ab am 2dfada6c: Merge "Cleanup - Change name of confirm credentials method after API review" into lmp-dev 
* commit '2dfada6c875acffd17f541aaac47aafb265b0164':
  Cleanup - Change name of confirm credentials method after API review
 2014-09-05 21:05:15 +00:00
Jae Seo
7492a4c1f4 Merge "API review: android.media.tv" into lmp-dev 2014-09-05 21:00:26 +00:00
Aravind Akella
b67d7e2345 Merge "Documentation fix for Sensor.getMaxDelay()" into lmp-dev 2014-09-05 20:58:53 +00:00
Jim Miller
fd5bf4ea77 Merge "Cleanup - Change name of confirm credentials method after API review" into lmp-dev 2014-09-05 20:58:17 +00:00
Eino-Ville Talvala
0eeac755df am 8a52744d: Merge "Camera2: Final API revisions" into lmp-dev 
* commit '8a52744d343dee6cc4958d0cc59484c036f3bf9f':
  Camera2: Final API revisions
 2014-09-05 20:52:48 +00:00
Eino-Ville Talvala
71aa8ab5d7 Merge "Camera2: Final API revisions" into lmp-dev 2014-09-05 20:43:52 +00:00
Jae Seo
2778f5a7bd API review: android.media.tv 
TvInputInfo
- Renamed getIntentForSettingsActivity to createSettingsIntent.
- Renamed getIntentForSetupActivity to createSetupIntent.
- Changed the value of EXTRA_INPUT_ID from inputId to
  android.media.tv.extra.INPUT_ID.
- Removed @hiden from CREATOR.

TvInputManager
- Renamed TvInputListener to TvInputCallback.
- Renamed registerListener to registerCallback.
- Renamed unregisterListener to unregisterCallback.
- Changed the value of ACTION_BLOCKED_RATINGS_CHANGED from
  android.media.tv.TvInputManager.ACTION_BLOCKED_RATINGS_CHANGED
  to android.media.tv.action.BLOCKED_RATINGS_CHANGED.
- Changed the value of ACTION_PARENTAL_CONTROLS_ENABLED_CHANGED from
  android.media.tv.TvInputManager.ACTION_PARENTAL_CONTROLS_ENABLED_CHANGED
  to android.media.tv.action.PARENTAL_CONTROLS_ENABLED_CHANGED.
- Changed the value of ACTION_QUERY_CONTENT_RATING_SYSTEMS from
  android.media.tv.TvInputManager.ACTION_QUERY_CONTENT_RATING_SYSTEMS
  to android.media.tv.action.QUERY_CONTENT_RATING_SYSTEMS.
- Changed the value of META_DATA_CONTENT_RATING_SYSTEMS from
  android.media.tv.TvInputManager.META_DATA_CONTENT_RATING_SYSTEMS
  to android.media.tv.metadata.CONTENT_RATING_SYSTEMS.

TvView
- Renamed TvInputListener to TvInputCallback.
- Renamed setTvInputListener to setCallback.

Bug: 17389538
Change-Id: I3dceee3db67862d77b183aef0da4fd3a8681ab1b
 2014-09-05 13:43:27 -07:00
Alan Viverette
831bc0c9cc am c70c59e5: Merge "Remove old setTint from Drawable" into lmp-dev 
* commit 'c70c59e5346fbe740db402df3ebb7ab6eef330e6':
  Remove old setTint from Drawable
 2014-09-05 20:15:42 +00:00
Alan Viverette
f2f3bde62f Merge "Remove old setTint from Drawable" into lmp-dev 2014-09-05 20:06:02 +00:00
Michael Wright
59f709836c am d2300a59: Merge "Allow for event dispatching when in non-interactive states." into lmp-dev 
* commit 'd2300a5972a9bb3e7530302cbf1a52550618bad9':
  Allow for event dispatching when in non-interactive states.
 2014-09-05 20:04:01 +00:00
Michael Wright
a6863ad622 Merge "Allow for event dispatching when in non-interactive states." into lmp-dev 2014-09-05 19:58:12 +00:00
RoboErik
372c1b1eb1 am 509d0b4e: Merge "send volume button events to adjustSuggestedStream instead of adjustStream" into lmp-dev 
* commit '509d0b4e3b65e737a4105d42138cc01306ff24b0':
  send volume button events to adjustSuggestedStream instead of adjustStream
 2014-09-05 19:53:45 +00:00
RoboErik
c16c4a6d2a am 545fdfe1: Merge "Minor tweaks to MediaBrowser" into lmp-dev 
* commit '545fdfe1a7d215054b16ee83cf050b4ac22e779a':
  Minor tweaks to MediaBrowser
 2014-09-05 19:53:42 +00:00
RoboErik
ad65c13916 am 52dcc8a1: Merge "rename add/removeCallback to register/unregisterCallback" into lmp-dev 
* commit '52dcc8a1dbd3e48e65253fa82b35bceb8428da75':
  rename add/removeCallback to register/unregisterCallback
 2014-09-05 19:53:38 +00:00
RoboErik
8e53a69f48 am fa8c8c3a: Merge "rename SERVICE_ACTION to SERVICE_INTERFACE" into lmp-dev 
* commit 'fa8c8c3a9488bd65e9729bbf9b98acbe55ade15a':
  rename SERVICE_ACTION to SERVICE_INTERFACE
 2014-09-05 19:53:34 +00:00
Amith Yamasani
0b4c65f577 am 221281ce: Merge "Rename getLocalApprovalIntent to createLocalApprovalIntent" into lmp-dev 
* commit '221281ce8bf1a1c99806ca4cd6137e7b77fd82a3':
  Rename getLocalApprovalIntent to createLocalApprovalIntent
 2014-09-05 19:53:30 +00:00
RoboErik
77a634503f Merge "send volume button events to adjustSuggestedStream instead of adjustStream" into lmp-dev 2014-09-05 19:49:56 +00:00
RoboErik
d89025f505 Merge "Minor tweaks to MediaBrowser" into lmp-dev 2014-09-05 19:49:46 +00:00
RoboErik
dfafca7691 Merge "rename add/removeCallback to register/unregisterCallback" into lmp-dev 2014-09-05 19:49:36 +00:00
RoboErik
845755d6e7 Merge "rename SERVICE_ACTION to SERVICE_INTERFACE" into lmp-dev 2014-09-05 19:45:44 +00:00
Amith Yamasani
4b278afa0d Merge "Rename getLocalApprovalIntent to createLocalApprovalIntent" into lmp-dev 2014-09-05 19:43:44 +00:00
Eino-Ville Talvala
fd887436bd Camera2: Final API revisions 
- Rename listeners to callbacks. Listeners are single-method and are interfaces,
  while callbacks are abstract may get more methods in the future.
- Use register/unregister for registering callbacks, not add/remove.

Bug: 17389922
Change-Id: Ic6b46ad79cb43a43a85e2a4b63f059d3af99798b
 2014-09-05 12:43:11 -07:00
Michael Wright
f195dca3a1 am e252525f: Merge "Add extra to ASSIST intent to indicate potential input type" into lmp-dev 
* commit 'e252525f6fda8dad56566d78a4881ab35778e9a6':
  Add extra to ASSIST intent to indicate potential input type
 2014-09-05 19:42:54 +00:00
RoboErik
272e161c1a send volume button events to adjustSuggestedStream instead of adjustStream 
This way the audio system can route the adjustments correctly when a bt
headset is connected.

bug:17281977
Change-Id: Ic41d038e47179baffc86e539562da285446148c7
 2014-09-05 12:37:39 -07:00
Michael Wright
57b4ad9f5a Merge "Add extra to ASSIST intent to indicate potential input type" into lmp-dev 2014-09-05 19:36:47 +00:00
Amit Mahajan
d096b8c061 am 2713311d: Merge "Add gid to configure no_ems_support_sim_operators" into lmp-dev 
* commit '2713311d60310b85e00a6e057ff47465e93dfa44':
  Add gid to configure no_ems_support_sim_operators
 2014-09-05 19:32:01 +00:00
Amit Mahajan
5e615d8e6b am d494e6cb: Merge "Fix the IndexOutOfBoundsException when unpacking GSM 8-bit pdu" into lmp-dev 
* commit 'd494e6cb1e61da0250261b7cdb76dd791c0c9571':
  Fix the IndexOutOfBoundsException when unpacking GSM 8-bit pdu
 2014-09-05 19:31:58 +00:00
Amit Mahajan
597827e460 Merge "Add gid to configure no_ems_support_sim_operators" into lmp-dev 2014-09-05 19:25:49 +00:00
Amit Mahajan
f11b43d8bf Merge "Fix the IndexOutOfBoundsException when unpacking GSM 8-bit pdu" into lmp-dev 2014-09-05 19:25:36 +00:00
Alan Viverette
bd5afc7186 Remove old setTint from Drawable 
BUG: 15782973
Change-Id: Idf0a6ea7c81135b032fcdadc46ee78d7db6945c7
 2014-09-05 12:23:18 -07:00
Jim Miller
2f2ebcd688 Cleanup - Change name of confirm credentials method after API review 
Fixes bug 17288988

Change-Id: I3d69b52e7ffc9f0268fb4dc9647f8704453668b7
 2014-09-05 12:11:48 -07:00
Ruben Brunk
74155c2ea8 am eb08250a: Merge "camera2: Undo mirror for front camera in legacy mode." into lmp-dev 
* commit 'eb08250a9bb7ad87518be9454eb9451d9b08c62f':
  camera2: Undo mirror for front camera in legacy mode.
 2014-09-05 19:00:27 +00:00
Wei Wang
135b3f4668 am 294383cc: Merge "Unregister app when advertise failed after registration." into lmp-dev 
* commit '294383ccc75090a4c616bef02dcd7572dcca6004':
  Unregister app when advertise failed after registration.
 2014-09-05 19:00:19 +00:00
Ruben Brunk
8eca9e0f0b Merge "camera2: Undo mirror for front camera in legacy mode." into lmp-dev 2014-09-05 18:52:54 +00:00
Wei Wang
6550557f99 Merge "Unregister app when advertise failed after registration." into lmp-dev 2014-09-05 18:49:27 +00:00
RoboErik
5dfa0a5f7a Minor tweaks to MediaBrowser 
-A swapped the param order on MediaBrowser.MediaItem constructor
-Added a missing aidl file for MediaItem

bug:17205016
Change-Id: I61538d76f76a993ed5a47b881e0d291fef1d8db3
 2014-09-05 11:40:34 -07:00
RoboErik
14f717a506 rename add/removeCallback to register/unregisterCallback 
bug:17390821
Change-Id: Id610b481083686dba2a28b6c7c47b747f89eef4f
 2014-09-05 11:40:33 -07:00
Svetoslav
ef88eea8e8 am b1d65d18: Merge "Fix runtime restart" into lmp-dev 
* commit 'b1d65d187db52c541ac71b5b9e3f34f15eb3001f':
  Fix runtime restart
 2014-09-05 18:38:11 +00:00
Svetoslav
df11867be3 Merge "Fix runtime restart" into lmp-dev 2014-09-05 18:30:42 +00:00
Svetoslav
7de2abb16c Fix runtime restart 
Change-Id: Ic50c8b3b06603ad517fdc8a2392ad12318d46817
 2014-09-05 11:28:00 -07:00
Jean-Michel Trivi
c06caf5545 am 0bd1a9d7: Merge "Permission check for entering MODE_IN_CALL" into lmp-dev 
* commit '0bd1a9d7c3ea358c520ff5ff6e066d3daab1b964':
  Permission check for entering MODE_IN_CALL
 2014-09-05 18:09:29 +00:00
Jean-Michel Trivi
3512bcd3af Merge "Permission check for entering MODE_IN_CALL" into lmp-dev 2014-09-05 18:00:51 +00:00
Jeff Sharkey
e167e433ba am a32e4e6b: Merge "Allow badging updates to install sessions." into lmp-dev 
* commit 'a32e4e6b1fafed78546f8084eea78e641a92124d':
  Allow badging updates to install sessions.
 2014-09-05 17:59:14 +00:00
Eino-Ville Talvala
eeb04cf2db am f62fb8f9: Merge "Camera2: Document supported target combinations for a session." into lmp-dev 
* commit 'f62fb8f94ac595d31da73fd791a2738737a13efa':
  Camera2: Document supported target combinations for a session.
 2014-09-05 17:59:10 +00:00
Chris Craik
3fa19375c9 am 8ff3e227: Merge "Replace native crash with IAE when calling picture.draw() w/ a HW canvas" into lmp-dev 
* commit '8ff3e227327d21bf8269af47efa4d91b6a32613b':
  Replace native crash with IAE when calling picture.draw() w/ a HW canvas
 2014-09-05 17:59:06 +00:00
Jeff Sharkey
43a2d06166 Merge "Allow badging updates to install sessions." into lmp-dev 2014-09-05 17:56:39 +00:00
Eino-Ville Talvala
48980da14d Merge "Camera2: Document supported target combinations for a session." into lmp-dev 2014-09-05 17:54:01 +00:00
Amith Yamasani
51a0e5b546 Rename getLocalApprovalIntent to createLocalApprovalIntent 
Based on API review.

Bug: 17389920
Change-Id: I84674f25a84d317f017473b6f4ac19c849079323
 2014-09-05 10:51:13 -07:00