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

154081 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sreeram Ramachandran
420af175d6 am 7f0120cc: am fc005f52: Merge "Unescape strings properly in NsdService." into lmp-dev 
* commit '7f0120ccc2ebe62b73393ae9aa2bd35ced9abd32':
  Unescape strings properly in NsdService.
 2014-09-05 22:40:10 +00:00
Christopher Tate
70175ba920 am 7cb42844: am 51a66814: Merge "Don\'t crash in addPackageHoldingPermissions()..." into lmp-dev 
* commit '7cb42844afc7f376ddb213011b74497e38f7a883':
  Don't crash in addPackageHoldingPermissions()...
 2014-09-05 22:40:05 +00:00
Chris Craik
8db569764f am d6d88a21: am cde5e68d: Merge "Additional layer logging, and added mutex" into lmp-dev 
* commit 'd6d88a21cfd226440b6e7f1f758a30d39b932a9e':
  Additional layer logging, and added mutex
 2014-09-05 22:40:00 +00:00
dcashman
3a2822b5ce am 87b01b0c: am 92f87bbb: Merge "Fix boolean comparison after sig check." into lmp-dev 
* commit '87b01b0cb3edf589c9d6d9a70f86e4d3caa8bc2a':
  Fix boolean comparison after sig check.
 2014-09-05 22:39:55 +00:00
Sreeram Ramachandran
8b3151fa49 am fc005f52: Merge "Unescape strings properly in NsdService." into lmp-dev 
* commit 'fc005f52578ed9fa3ea34fa5f29085b25a9ff566':
  Unescape strings properly in NsdService.
 2014-09-05 22:35:55 +00:00
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
Sreeram Ramachandran
624a205e74 Merge "Unescape strings properly in NsdService." into lmp-dev 2014-09-05 22:26: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
6c62705d50 am 26c00d5a: am fd7d35d0: Merge "Reduce chance of notification listener dropped messages." into lmp-dev 
* commit '26c00d5a4bdbdcdbefe7f5d7e3ce34d92382bbc0':
  Reduce chance of notification listener dropped messages.
 2014-09-05 22:10:10 +00:00
Nancy Chen
e7824f8dc1 am 483354d9: am 266fcee6: Merge "Rename listener to callback for ConferenceManager and rename strings 1/4" into lmp-dev 
* commit '483354d98a52cacaa082b7d4f0dc276b70e0e5ab':
  Rename listener to callback for ConferenceManager and rename strings 1/4
 2014-09-05 22:04:36 +00:00
Jean-Michel Trivi
c7102f1a7a am c256b10b: am aa82a6c7: Merge "Update the broadcasts reserved to the system" into lmp-dev 
* commit 'c256b10b3efd2becea1ec0c6a92a0dcf74d53938':
  Update the broadcasts reserved to the system
 2014-09-05 22:04:32 +00: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
Carlos Valdivia
612c4628b2 am 63f80d84: am aa6e14fd: Merge "We shouldn\'t delete accounts when a package is being updated." into lmp-dev 
* commit '63f80d8419ee077deb5bec31a9b14de8e82d0ae1':
  We shouldn't delete accounts when a package is being updated.
 2014-09-05 21:57:57 +00:00
Jae Seo
803ee82450 am f550dd4d: am caf3c12c: Merge "API review: android.media.tv" into lmp-dev 
* commit 'f550dd4d1cb8a57a2269a1ed0ea26aaf1da1efca':
  API review: android.media.tv
 2014-09-05 21:57:51 +00:00
Aravind Akella
701141cd1f am f109a7de: am 6a7a06ee: Merge "Documentation fix for Sensor.getMaxDelay()" into lmp-dev 
* commit 'f109a7de857d21ec11c6020a5556d7adc78a3c08':
  Documentation fix for Sensor.getMaxDelay()
 2014-09-05 21:57:47 +00:00
Jim Miller
09629ec160 am bb9e9c7b: am 2dfada6c: Merge "Cleanup - Change name of confirm credentials method after API review" into lmp-dev 
* commit 'bb9e9c7b0586dc35158529e8d10cd6b10f5e7498':
  Cleanup - Change name of confirm credentials method after API review
 2014-09-05 21:57:42 +00:00
Eino-Ville Talvala
663debf045 am a42873d6: am 8a52744d: Merge "Camera2: Final API revisions" into lmp-dev 
* commit 'a42873d60a55a65fe36de12c032714403e3e161f':
  Camera2: Final API revisions
 2014-09-05 21:57:16 +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
Sreeram Ramachandran
ef12884da7 Unescape strings properly in NsdService. 
NativeDaemonEvent.unescapeArgs() was improperly skipping the terminating
quote in cases like "\\", where the char preceding the quote is a
backslash, but the backslash itself is escaped, so the quote is indeed
an unescaped terminator.

unescapeArgs() doesn't unescape "\xxx" decimal escapes used by mDNS, so
fix NsdService to do that sort of unescaping explicitly (which is only
applicable when it receives a "fullname", in SERVICE_RESOLVED).

Bug: 16983542
Bug: 16986203

Change-Id: Idfa79749336c68424d961bc414f984c525b7e5e6
 2014-09-05 20:31:46 +00:00
Alan Viverette
98055fed56 am 63097051: am c70c59e5: Merge "Remove old setTint from Drawable" into lmp-dev 
* commit '6309705189091f75e9fedb807403b77051d7fb39':
  Remove old setTint from Drawable
 2014-09-05 20:27:09 +00:00
Michael Wright
415627ba39 am 3a448381: am d2300a59: Merge "Allow for event dispatching when in non-interactive states." into lmp-dev 
* commit '3a4483814783cfa108263ea2707b7f9e9b4dd9e2':
  Allow for event dispatching when in non-interactive states.
 2014-09-05 20:21:52 +00:00
RoboErik
c80ee57f21 am 8466b902: am 509d0b4e: Merge "send volume button events to adjustSuggestedStream instead of adjustStream" into lmp-dev 
* commit '8466b902f8013687587e06221e8e957352f2d03c':
  send volume button events to adjustSuggestedStream instead of adjustStream
 2014-09-05 20:21:40 +00:00
RoboErik
7ba09b1bb4 am 2a4d19b1: am 545fdfe1: Merge "Minor tweaks to MediaBrowser" into lmp-dev 
* commit '2a4d19b1260b2a39a174c331288184d603a8f0ee':
  Minor tweaks to MediaBrowser
 2014-09-05 20:21:35 +00:00
RoboErik
006775875a am a21df8dd: am 52dcc8a1: Merge "rename add/removeCallback to register/unregisterCallback" into lmp-dev 
* commit 'a21df8dda1a6b0f97d37d1f0cd6d2901e66cdc37':
  rename add/removeCallback to register/unregisterCallback
 2014-09-05 20:21:29 +00:00
RoboErik
b39a4dc75e am 8c47737f: am fa8c8c3a: Merge "rename SERVICE_ACTION to SERVICE_INTERFACE" into lmp-dev 
* commit '8c47737f76df45c575fb76733b79b9a024733eb2':
  rename SERVICE_ACTION to SERVICE_INTERFACE
 2014-09-05 20:21:24 +00:00
Amith Yamasani
0859c2c760 am 6b71eada: am 221281ce: Merge "Rename getLocalApprovalIntent to createLocalApprovalIntent" into lmp-dev 
* commit '6b71eadab04964e8fe28ff98c3747ffe937f89ac':
  Rename getLocalApprovalIntent to createLocalApprovalIntent
 2014-09-05 20:21:19 +00:00