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

138617 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Michel Trivi
8a21f5dd79 AudioManager: add ability to allocate a new session ID 
Expose method to allocate a new session ID.
Make the generic error code public.

Change-Id: Iec93548292845e3a1b1a97be9bbe54e9fcf06f2d
 2014-06-10 12:44:04 -07:00
Jeff Brown
8c90ff3b8a Merge "Delete stale commented out declarations." 2014-06-10 01:43:44 +00:00
Justin Koh
0c4122c9b5 am ce8c1086: am eba8782a: Add NPE check to getSystemWindowInsets 
* commit 'ce8c1086fbc42e80056b59d9dbbd6144cb85f20d':
  Add NPE check to getSystemWindowInsets
 2014-06-10 01:30:21 +00:00
Justin Koh
36b0cae955 am 2be4ddc4: am a5de8479: Merge "Fix Browser when running on a platform without webview" into klp-modular-dev 
* commit '2be4ddc403b55e3c5107609a2eaeed4ddc0f23f0':
  Fix Browser when running on a platform without webview
 2014-06-10 01:30:16 +00:00
Robert Ly
55762575b0 am a60406f5: am e70609c8: am 5cb18054: am e115755d: Merge "remove erroneous file" into klp-docs 
* commit 'a60406f5465208079c14770defcfcced10432481':
  remove erroneous file
 2014-06-10 01:30:11 +00:00
Adam Lesinski
3cfe720a0d am 5fed49f7: am 4d9fcae2: Merge "Allow for a NoOp implementation of DrmManagerClientImpl" into klp-modular-dev 
* commit '5fed49f7d614ae9e83db04703484b31c8077b78c':
  Allow for a NoOp implementation of DrmManagerClientImpl
 2014-06-10 01:30:05 +00:00
Craig Mautner
e1ab884a67 Merge "resolved conflicts for merge of 1e6706ab to master" 2014-06-10 01:27:07 +00:00
Amith Yamasani
8108d7f3bf Merge "Make LocationManagerService aware of user profiles" 2014-06-10 01:20:20 +00:00
Amith Yamasani
b27528d066 Make LocationManagerService aware of user profiles 
LocationManagerService normally doesn't provide location to background users.
With managed profiles, there are more than one foreground users and they both
need to get location when in the foreground. So LMS will now compare the caller
against all foreground users and provide location if valid.

Bug: 14671472
Change-Id: If3baabfc5a3ab3f2f081d7fc28f35d840d5f1489
 2014-06-09 18:06:20 -07:00
Mike J. Chen
a565754a81 Merge "Update default android boot animation png files" 2014-06-10 00:55:07 +00:00
Adam Lesinski
961dda7796 Creating an empty package should be succesfull 
Bug: 15473436
Change-Id: I788deb21a1298281c508429bab635aa713803984
 2014-06-09 17:10:29 -07:00
Jeff Brown
e2708d98ce Delete stale commented out declarations. 
Most of these methods have now been implememented earlier
in the class.

Change-Id: Id9ef2fa09c64ada788f1b9d95b14836f98498843
 2014-06-09 17:04:06 -07:00
Mike J. Chen
784184e75d Update default android boot animation png files 
Bug 15143975

Change-Id: I11c9f43aaec4ebff9d291084fc8f997f15c46ddd
Signed-off-by: Mike J. Chen <mjchen@google.com>
 2014-06-09 15:54:00 -07:00
Michael Kolb
7119c07192 resolved conflicts for merge of 1e6706ab to master 
Change-Id: Ia8e8fdf5e13acca496bf7ff9916c9950d5b13e4e
 2014-06-09 15:35:59 -07:00
vandwalle
6123315ad4 Merge "remember and report network score" 2014-06-09 22:30:26 +00:00
Chris Craik
cb9851d4fe Merge "Annotated the drawing commands." 2014-06-09 22:22:11 +00:00
vandwalle
2ab9089dfa remember and report network score 
Change-Id: Iccb2ec603bc9c0d3cf1976d0cc3f343cb1096494
 2014-06-09 14:50:47 -07:00
Justin Koh
ce8c1086fb am eba8782a: Add NPE check to getSystemWindowInsets 
* commit 'eba8782a1f8412a3510fc78a71b843ef6e89bdbb':
  Add NPE check to getSystemWindowInsets
 2014-06-09 21:12:39 +00:00
Justin Koh
2be4ddc403 am a5de8479: Merge "Fix Browser when running on a platform without webview" into klp-modular-dev 
* commit 'a5de8479f442b7e6f8d285db58713e42fb922798':
  Fix Browser when running on a platform without webview
 2014-06-09 21:12:35 +00:00
Robert Ly
a60406f546 am e70609c8: am 5cb18054: am e115755d: Merge "remove erroneous file" into klp-docs 
* commit 'e70609c87e7de59dbe9c01226bd251a705e71305':
  remove erroneous file
 2014-06-09 21:12:31 +00:00
Adam Lesinski
5fed49f7d6 am 4d9fcae2: Merge "Allow for a NoOp implementation of DrmManagerClientImpl" into klp-modular-dev 
* commit '4d9fcae2024c9be8d5bd7e92cd836aa8b9cacc5b':
  Allow for a NoOp implementation of DrmManagerClientImpl
 2014-06-09 21:12:25 +00:00
Michael Kolb
1e6706abb2 am 4bdc93d6: Merge "Remove circular mask" into klp-modular-dev 
* commit '4bdc93d63e9edc7840a227ea1824f1f7ac93933e':
  Remove circular mask
 2014-06-09 21:12:19 +00:00
Jeff Brown
a2f61a39ea Merge "Add @SystemApi annotation to internal permissions." 2014-06-09 21:05:43 +00:00
Jeff Brown
96c2e9f1cb Merge "Add support for @SystemApi annotation to aapt." 2014-06-09 21:05:17 +00:00
Antonio Calabrese
ff7215aa0c Annotated the drawing commands. 
Change-Id: I4eeb35ecaf4aa16e0924b5215351fce79c68369b
 2014-06-09 13:37:00 -07:00
RoboErik
e252909394 am 6580a31d: Merge "Adds listeners for changes to the list of active sessions" into lmp-preview-dev 
* commit '6580a31db0727dfffba99069f4866ad01fc88cfb':
  Adds listeners for changes to the list of active sessions
 2014-06-09 19:29:58 +00:00
RoboErik
03df2c5153 am 91ead28f: Merge "b/15388389 Add volume handling support to MediaRouter" into lmp-preview-dev 
* commit '91ead28f8e0d22df8c4eaed4295e8c0e1e21e35f':
  b/15388389 Add volume handling support to MediaRouter
 2014-06-09 19:29:53 +00:00
RoboErik
58af2199a5 am ddbdcd09: Merge "Add a way to get the package/pid of the session" into lmp-preview-dev 
* commit 'ddbdcd092d1b71b987d680a8b1a5140832625410':
  Add a way to get the package/pid of the session
 2014-06-09 19:29:48 +00:00
RoboErik
5f670bd65c am 7d0b1256: Merge "b/15452153 Send 0 delta volume requests" into lmp-preview-dev 
* commit '7d0b1256e3a08a1b0a98f217eb9a0e9f5809f57e':
  b/15452153 Send 0 delta volume requests
 2014-06-09 19:29:42 +00:00
Jae Seo
8799179638 am a6b44fe7: Merge "Fix a typo in TvContract" into lmp-preview-dev 
* commit 'a6b44fe7d3ab727de2b82d73209efdc9bdb57b41':
  Fix a typo in TvContract
 2014-06-09 19:29:28 +00:00
Jerome Poichet
7fc1e22150 am 576563c3: Merge "Using Manufacturer and not brand for device name" into lmp-preview-dev 
* commit '576563c3d37ba58bc94e87aa385d92dc79498003':
  Using Manufacturer and not brand for device name
 2014-06-09 19:29:23 +00:00
Jae Seo
9aea9c93c5 am 73fe04a4: Merge "TIF: Address the feedback from the API review - 3/3" into lmp-preview-dev 
* commit '73fe04a41f88eb9e4a9da8e229351ce8458d0e0d':
  TIF: Address the feedback from the API review - 3/3
 2014-06-09 19:29:17 +00:00
Dan Sandler
0d99a507b2 am 6e73d4a9: Fix mangled XML. 
* commit '6e73d4a9d9d1031d302a7e1f21939c9239c0549d':
  Fix mangled XML.
 2014-06-09 19:29:08 +00:00
Dan Sandler
f730eab54c am d8349135: Pour one out for the old notification ticker. 
* commit 'd8349135a3189d4d4fd4180b0bffd2a987d4379d':
  Pour one out for the old notification ticker.
 2014-06-09 19:29:02 +00:00
Daniel Sandler
d343aff26d am e7078cf9: Move CATEGORY_NOTIFICATION_PREFERENCES to Notification. 
* commit 'e7078cf9c41f5e3581a80b2129ae77719b0f69a4':
  Move CATEGORY_NOTIFICATION_PREFERENCES to Notification.
 2014-06-09 19:28:56 +00:00
RoboErik
a3d8188556 Merge "Adds listeners for changes to the list of active sessions" into lmp-preview-dev 2014-06-09 19:07:49 +00:00
RoboErik
55f6ab4c81 Merge "b/15388389 Add volume handling support to MediaRouter" into lmp-preview-dev 2014-06-09 19:07:34 +00:00
RoboErik
20685929a4 Merge "Add a way to get the package/pid of the session" into lmp-preview-dev 2014-06-09 19:07:20 +00:00
RoboErik
b6b31f2741 Merge "b/15452153 Send 0 delta volume requests" into lmp-preview-dev 2014-06-09 19:07:10 +00:00
Jae Seo
085eefd184 Merge "Fix a typo in TvContract" into lmp-preview-dev 2014-06-09 18:43:27 +00:00
Jerome Poichet
cbe8e35bda Merge "Using Manufacturer and not brand for device name" into lmp-preview-dev 2014-06-09 18:42:20 +00:00
Jae Seo
182dc33e9e Merge "TIF: Address the feedback from the API review - 3/3" into lmp-preview-dev 2014-06-09 18:38:43 +00:00
Justin Koh
eba8782a1f Add NPE check to getSystemWindowInsets 
Bug: 15452706
Change-Id: Ica83593eadd0155e1370dba268a9f15ad0affa7d
 2014-06-09 11:31:53 -07:00
Justin Koh
a5de8479f4 Merge "Fix Browser when running on a platform without webview" into klp-modular-dev 2014-06-09 18:29:39 +00:00
Justin Koh
b4be02088f Fix Browser when running on a platform without webview 
Fix Browser: can't access the WebIconDatabase. Added build version checks so
that the icon database isn't used on devices <= KITKAT: the entire class is
deprecated as of JB MR2 anyway, according to the comments.
Bug: 15088030

Change-Id: I4403b1a429c08abb288f5ee3bae7eb2e23303916
 2014-06-09 11:28:53 -07:00
Julia Reynolds
dc920984f2 Merge "Allow profile and device owners to change and get the master volume mute state." 2014-06-09 18:25:06 +00:00
Julia Reynolds
4a21b25fad Allow profile and device owners to change and get the master volume mute state. 
Also protect muting master volume with op code OP_AUDIO_MASTER_VOLUME.
Bug: 13585918
Change-Id: I91fe7ee60cd291cca15966b3127c0bb8a4828f6a
 2014-06-09 14:18:01 -04:00
Ed Heyl
f914a89073 fix conflict markers 
Change-Id: I0b95da6a8cb461dfaf7db026b6d190e2dcbe6935
 2014-06-09 10:59:22 -07:00
Jae Seo
f30ea53306 Fix a typo in TvContract 
Assigned a new value to TYPE_ATSC_M_H so that it differs from TYPE_ATSC_C.

Change-Id: I65494fdf625a3b4840c9e8cfa4b728214d63e6df
 2014-06-09 17:50:07 +00:00
Adam Connors
b6d305ecf4 am ef4dfabe: API Review: rename FEATURE_MANAGEDPROFILES 
* commit 'ef4dfabe22df2ce86cdf732c4a27ce8dcd8fad51':
  API Review: rename FEATURE_MANAGEDPROFILES
 2014-06-09 17:44:50 +00:00