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

152183 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
a3e49a4b1d Propagate drawable hotspots when duplicate parent state is enabled 
Makes hotspot-centered ripples "just work" everywhere that old-style
pressed states work.

BUG: 17407652
Change-Id: Id4802662aea537959122f029e85aa576cf51b641
 2014-09-05 13:10:12 -07: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
Alan Viverette
bd5afc7186 Remove old setTint from Drawable 
BUG: 15782973
Change-Id: Idf0a6ea7c81135b032fcdadc46ee78d7db6945c7
 2014-09-05 12:23:18 -07:00
Alan Viverette
a3f0c2b21a Simplify ripple background drawing, fix ripple alphas 
Eliminates an extra saveLayer on the background in the common case of
a rectangle-bounded ripple.

Ripples and backgrounds are now drawn at 50% opacity of the ripple
color, which ensures that both the ripple and background are visible
and that the pressed state has a correct combined alpha.

Also fixes a bug where hardware (RT) animation was getting turned off
prematurely.

BUG: 17405007
BUG: 17398089
BUG: 17394445
BUG: 17389859
Change-Id: Idb5808368fe563581a51a8cb9778275ee8d22f4c
 2014-09-05 19:15:44 +00:00
George Mount
21f54f3940 Only call setHasTransientState in captureHierarchy. 
Bug 17390936

Change-Id: I1a8cdc2820b53f6ca9f6edc41a7e87f45bea7811
 2014-09-05 12:13:49 -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
c35d931a1e 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 18:59:51 +00:00
Wei Wang
f01b987dd1 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 18:59:46 +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
6ece518682 am b1d65d18: Merge "Fix runtime restart" into lmp-dev 
* commit 'b1d65d187db52c541ac71b5b9e3f34f15eb3001f':
  Fix runtime restart
 2014-09-05 18:38:19 +00:00
Jason Monk
d208c79b3e Update downtime to handle TimeZone change 
Bug: 17344461
Change-Id: Ic18d0c469fac5a4c8973e52dd1e687cea2266b55
 2014-09-05 14:34:32 -04: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
99768f0157 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:10:22 +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
46378d1ee2 am a32e4e6b: Merge "Allow badging updates to install sessions." into lmp-dev 
* commit 'a32e4e6b1fafed78546f8084eea78e641a92124d':
  Allow badging updates to install sessions.
 2014-09-05 17:58:48 +00:00
Eino-Ville Talvala
913709cda2 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:58:44 +00:00
Chris Craik
9b961efe62 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:58:40 +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
Chris Craik
def8a37128 Merge "Replace native crash with IAE when calling picture.draw() w/ a HW canvas" into lmp-dev 2014-09-05 17:49:20 +00:00
Chris Craik
85c6496a7d am 96b6b3df: Merge "Hide color filter mutability" into lmp-dev 
* commit '96b6b3dfc55f08752084b472cf9c62c22a2f2759':
  Hide color filter mutability
 2014-09-05 17:38:11 +00:00
Christopher Ferris
35e32837d1 am 3110fe01: Merge "Add new header to support 32 bit/64 bit dumps." into lmp-dev 
* commit '3110fe01137b9a496533cd534df148d3105253a6':
  Add new header to support 32 bit/64 bit dumps.
 2014-09-05 17:38:07 +00:00
George Mount
4a4b3beeb0 am 1377fe31: Merge "API Review: Improve javadoc." into lmp-dev 
* commit '1377fe31f3d655e5d764b213904131f7e75a870d':
  API Review: Improve javadoc.
 2014-09-05 17:37:58 +00:00