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

151948 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Tate
75da2b9af3 am 51a66814: Merge "Don\'t crash in addPackageHoldingPermissions()..." into lmp-dev 
* commit '51a66814c9520658f697470bce342ea10ee4d3a5':
  Don't crash in addPackageHoldingPermissions()...
 2014-09-05 22:27:30 +00:00
Chris Craik
74a4d1b844 am cde5e68d: Merge "Additional layer logging, and added mutex" into lmp-dev 
* commit 'cde5e68dd85afe16c90eef3e8bc89a323d5e3515':
  Additional layer logging, and added mutex
 2014-09-05 22:27:25 +00:00
dcashman
eeeda1bd3e am 92f87bbb: Merge "Fix boolean comparison after sig check." into lmp-dev 
* commit '92f87bbb9377c54815e6f5cc24fbfb7a652efcb9':
  Fix boolean comparison after sig check.
 2014-09-05 22:27:20 +00:00
Christopher Tate
a0c9962388 Merge "Don't crash in addPackageHoldingPermissions()..." into lmp-dev 2014-09-05 22:23:07 +00:00
Chris Craik
c378b3e079 Merge "Additional layer logging, and added mutex" into lmp-dev 2014-09-05 22:22:16 +00:00
dcashman
522f671eb0 Merge "Fix boolean comparison after sig check." into lmp-dev 2014-09-05 22:18:50 +00:00
Chris Craik
599e254ea3 Additional layer logging, and added mutex 
bug:17208461
Change-Id: I006d432a3b633235dde0b81ad2bf28b835b5335f
 2014-09-05 15:17:11 -07:00
Griff Hazen
4c62f0ce7c am fd7d35d0: Merge "Reduce chance of notification listener dropped messages." into lmp-dev 
* commit 'fd7d35d0ce4f9fc585b42f11c1844ddbaab6307f':
  Reduce chance of notification listener dropped messages.
 2014-09-05 22:00:44 +00:00
Christopher Tate
30f349d2ef Don't crash in addPackageHoldingPermissions()... 
...in cases involving uninstalled apps, or apps whose install state
varies across different users.

Bug 17398315

Change-Id: I7297d82f8bf5d49c50a7fd53d795a706bf2d2313
 2014-09-05 21:58:32 +00:00
Griff Hazen
69dd40d08a Merge "Reduce chance of notification listener dropped messages." into lmp-dev 2014-09-05 21:52:44 +00:00
Nancy Chen
1aa570500e am 266fcee6: Merge "Rename listener to callback for ConferenceManager and rename strings 1/4" into lmp-dev 
* commit '266fcee694598b685fb4d33c6e6a581b0152704d':
  Rename listener to callback for ConferenceManager and rename strings 1/4
 2014-09-05 21:52:25 +00:00
Jean-Michel Trivi
15d3a4ae9e am aa82a6c7: Merge "Update the broadcasts reserved to the system" into lmp-dev 
* commit 'aa82a6c7adc6de4ec3f843328f7bb207aa6540ec':
  Update the broadcasts reserved to the system
 2014-09-05 21:48:01 +00:00
Nancy Chen
cf2858d363 Merge "Rename listener to callback for ConferenceManager and rename strings 1/4" into lmp-dev 2014-09-05 21:46:27 +00:00
dcashman
2de4f9f971 Fix boolean comparison after sig check. 
Bug: 17402843
Change-Id: I0cb5ffba1a93f71a250294a41040011234ce1029
 2014-09-05 14:45:46 -07:00
Jean-Michel Trivi
d87f2107d9 Merge "Update the broadcasts reserved to the system" into lmp-dev 2014-09-05 21:37:27 +00:00
Carlos Valdivia
b8b5dfb885 am aa6e14fd: Merge "We shouldn\'t delete accounts when a package is being updated." into lmp-dev 
* commit 'aa6e14fda27cfc7a9bfdcef90adda3563b1846a8':
  We shouldn't delete accounts when a package is being updated.
 2014-09-05 21:05:30 +00:00
Jae Seo
10e009e70e am caf3c12c: Merge "API review: android.media.tv" into lmp-dev 
* commit 'caf3c12ca1ee420acdbb0181ffe5a0497ce84af3':
  API review: android.media.tv
 2014-09-05 21:05:24 +00:00
Aravind Akella
1270dc1b22 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
ca50c9b70b 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
Carlos Valdivia
605e71922e Merge "We shouldn't delete accounts when a package is being updated." into lmp-dev 2014-09-05 21:01:53 +00:00
Jae Seo
7492a4c1f4 Merge "API review: android.media.tv" into lmp-dev 2014-09-05 21:00:26 +00:00
Nancy Chen
1d834f51df Rename listener to callback for ConferenceManager and rename strings 1/4 
Updates for items from API review. See bug for details.

Bug: 17390175
Change-Id: I716a12b763766a385b08f8731d9533589639f467
 2014-09-05 13:59:11 -07:00
Aravind Akella
b67d7e2345 Merge "Documentation fix for Sensor.getMaxDelay()" into lmp-dev 2014-09-05 20:58:53 +00:00
Carlos Valdivia
23f58260bd We shouldn't delete accounts when a package is being updated. 
Bug: 17158237
Change-Id: Icbf9e672a6a698737b08ed39c78a64c161a7b802
 2014-09-05 13:58:31 -07: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
3954f349cd am 8a52744d: Merge "Camera2: Final API revisions" into lmp-dev 
* commit '8a52744d343dee6cc4958d0cc59484c036f3bf9f':
  Camera2: Final API revisions
 2014-09-05 20:55:50 +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
54d0ef2947 am c70c59e5: Merge "Remove old setTint from Drawable" into lmp-dev 
* commit 'c70c59e5346fbe740db402df3ebb7ab6eef330e6':
  Remove old setTint from Drawable
 2014-09-05 20:17:08 +00:00
Alan Viverette
f2f3bde62f Merge "Remove old setTint from Drawable" into lmp-dev 2014-09-05 20:06:02 +00:00
Michael Wright
3502391321 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:03:52 +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
59c383ca7a 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:54:08 +00:00
RoboErik
8ac2cbcbba am 545fdfe1: Merge "Minor tweaks to MediaBrowser" into lmp-dev 
* commit '545fdfe1a7d215054b16ee83cf050b4ac22e779a':
  Minor tweaks to MediaBrowser
 2014-09-05 19:54:03 +00:00
RoboErik
8c1f4d1793 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:58 +00:00
RoboErik
1a7e986bbd 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:52 +00:00
Amith Yamasani
40ff711ee9 am 221281ce: Merge "Rename getLocalApprovalIntent to createLocalApprovalIntent" into lmp-dev 
* commit '221281ce8bf1a1c99806ca4cd6137e7b77fd82a3':
  Rename getLocalApprovalIntent to createLocalApprovalIntent
 2014-09-05 19:53:47 +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
Michael Wright
ad759a1184 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:43:21 +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
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
15ee071096 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:31:33 +00:00
Amit Mahajan
96bffa48d7 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:29 +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