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

151906 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Chris Craik
96890564bd Replace native crash with IAE when calling picture.draw() w/ a HW canvas 
bug:17397958
Change-Id: I75f942db0e604f9fd6ab31e6c81f718c0f57b16a
 2014-09-05 10:33:39 -07:00
Chris Craik
0edfd0be15 Merge "Hide color filter mutability" into lmp-dev 2014-09-05 17:30:50 +00:00
Christopher Ferris
982f21fec2 Merge "Add new header to support 32 bit/64 bit dumps." into lmp-dev 2014-09-05 17:30:21 +00:00
George Mount
0ff16cf43a Merge "API Review: Improve javadoc." into lmp-dev 2014-09-05 17:29:29 +00:00
Svetoslav
5cf8b4b751 am f1a858c7: Fix broken aidl 
* commit 'f1a858c7887ba8af0cf991fd6fa8a1f72e069ff1':
  Fix broken aidl
 2014-09-05 17:29:23 +00:00
George Mount
f9557619a7 API Review: Improve javadoc. 
Bug 17189781
Also rename PatternMotion to PatternPathMotion

Change-Id: I1c4dcbdd65e33cf9de1504277e31f9f7ede0380d
 2014-09-05 10:27:27 -07:00
Svetoslav
d0c362de1c Fix broken aidl 
Change-Id: I2187abd75b4f60e790b747a492ad610592f2ef53
 2014-09-05 10:19:39 -07:00
Jeff Sharkey
ec9bad2015 Allow badging updates to install sessions. 
For the system restore use-case, an installer may need to enqueue
their sessions quickly before badging details, like icons, have been
downloaded.  This change relaxes to allow an installer to update
their session badging after the session has been created.  Notify
observers when badging changes.

Rename callback registration methods to match style guide.  Relax
constraint that observers are home app.  Fix bug around internal
progress reporting.

Bug: 17376797, 17389236, 17334199
Change-Id: I5fb88508baea2f08e89a1504fcf5ef972afad4a7
 2014-09-05 10:15:15 -07:00
Svetoslav
6fadd4436b am 4c8c9ac0: Merge "Update FrameStats API per api-council request." into lmp-dev 
* commit '4c8c9ac06fc213d9bc9d82c39d55f425fee5b429':
  Update FrameStats API per api-council request.
 2014-09-05 17:13:29 +00:00
Svetoslav
bd7958e6d9 am 6f0cf112: Merge "Addressing API council comments for UserManager." into lmp-dev 
* commit '6f0cf112a712cd1a9e77a9b2b66e5f771d4e061e':
  Addressing API council comments for UserManager.
 2014-09-05 17:13:24 +00:00
Wei Liu
3643ed959b am ea237b13: am 0641ab3d: am 636f3eac: Add clear_top flag to settings action intent. Bug: 17200185 
* commit 'ea237b130ddc76269131a2cb7ef56940033fea7e':
  Add clear_top flag to settings action intent. Bug: 17200185
 2014-09-05 17:13:19 +00:00
Amith Yamasani
24d919c12c am 3c0a511d: Merge "Remove class that was moved to a different package." into lmp-dev 
* commit '3c0a511dee505d46ebab80a9b5a1579d39e597fd':
  Remove class that was moved to a different package.
 2014-09-05 17:13:15 +00:00
Svetoslav
c5564b8c0e Merge "Update FrameStats API per api-council request." into lmp-dev 2014-09-05 17:09:45 +00:00
Svetoslav
e2da374d6e Merge "Addressing API council comments for UserManager." into lmp-dev 2014-09-05 17:08:12 +00:00
Wei Liu
133f143069 am 0641ab3d: am 636f3eac: Add clear_top flag to settings action intent. Bug: 17200185 
* commit '0641ab3dd0282edc272f425a245ede63a78dd222':
  Add clear_top flag to settings action intent. Bug: 17200185
 2014-09-05 17:07:19 +00:00