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

154388 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
5abb80468e am 01efa7e6: am 89e86555: Merge "Separate active state from open/close." into lmp-dev 
* commit '01efa7e6bcbaf781b589dd120d079ebc9e132069':
  Separate active state from open/close.
 2014-09-05 23:48:54 +00:00
Junda Liu
b8025f3260 Hide APIs for simplified network settings. 
Bug: b/17255752
Change-Id: Ibbe5d5cdbc2398ba0df2103bd7a33b98dc977734
 2014-09-05 16:46:38 -07:00
Santos Cordon
f7c8b58e84 Merge "Updating APIs for CDMA conference call support." into lmp-dev 2014-09-05 23:46:11 +00:00
Jean-Michel Trivi
749eec706a am 2a56275e: Merge "Respect Android conventions in AudioManager extras" into lmp-dev 
* commit '2a56275e4f09d0bd7e2b50d694686ff3f15357a2':
  Respect Android conventions in AudioManager extras
 2014-09-05 23:46:05 +00:00
Jean-Michel Trivi
ae104eb6c6 am 1c01afc0: Merge "AudioAttributes: unhide CREATOR" into lmp-dev 
* commit '1c01afc06ed47fbd983bc8e7c52851d0518021d7':
  AudioAttributes: unhide CREATOR
 2014-09-05 23:46:00 +00:00
Alan Viverette
e9921370d7 Merge "Simplify ripple background drawing, fix ripple alphas" into lmp-dev 2014-09-05 23:45:36 +00:00
Jeff Sharkey
d560851911 am 89e86555: Merge "Separate active state from open/close." into lmp-dev 
* commit '89e865552f42db5cc31ef48ad35f3392e4ed1ac2':
  Separate active state from open/close.
 2014-09-05 23:41:14 +00:00
Jean-Michel Trivi
afd899c61f Merge "Respect Android conventions in AudioManager extras" into lmp-dev 2014-09-05 23:37:10 +00:00
Jean-Michel Trivi
2caa0a6070 Merge "AudioAttributes: unhide CREATOR" into lmp-dev 2014-09-05 23:36:44 +00:00
Jeff Sharkey
5341f94a19 Merge "Separate active state from open/close." into lmp-dev 2014-09-05 23:28:31 +00:00
Lajos Molnar
18933561f3 am 89315051: am 00352e1e: Merge "MediaCodecInfo: allow getting info for secure codec" into lmp-dev 
* commit '8931505148d824aaae3d3bb93cb8a9795b203a13':
  MediaCodecInfo: allow getting info for secure codec
 2014-09-05 23:26:04 +00:00
Lajos Molnar
e2e0e37c73 am 66522343: am fd03c56c: Merge "MediaCodecInfo: rename createFromProfileLevel" into lmp-dev 
* commit '665223438c856e56c27af5892c3eeabd0f0dc8ea':
  MediaCodecInfo: rename createFromProfileLevel
 2014-09-05 23:25:53 +00:00
Lajos Molnar
888739e7dc am 00352e1e: Merge "MediaCodecInfo: allow getting info for secure codec" into lmp-dev 
* commit '00352e1eec8b09375e695fb54f6fffc023bb6aa9':
  MediaCodecInfo: allow getting info for secure codec
 2014-09-05 23:19:29 +00:00
Lajos Molnar
fe08443eb5 am fd03c56c: Merge "MediaCodecInfo: rename createFromProfileLevel" into lmp-dev 
* commit 'fd03c56cbb2be8db4f381c8459d405129e92e569':
  MediaCodecInfo: rename createFromProfileLevel
 2014-09-05 23:19:24 +00:00
Jon Miranda
042ad633bc Added getStyleAttributes to access all Theme attributes. 
ViewDebug uses getStyleAttributes to get the attributes, and then gets the
attribute name and value so that Hierarchy Viewer can display it.

Bug: 17407087
Change-Id: I3577e32ae99668383701dc908bb46db14a75c3c4
 2014-09-05 16:19:08 -07:00
Jeff Sharkey
bc7bce38b2 Separate active state from open/close. 
Also change name to setStagingProgress() to make it clearer that
system may adjust the range.  Start throwing from openSession() in
preparation for ASEC allocation moving.

Bug: 17405741
Change-Id: Id7da51a32d5d89cb512ddafbd7ceaafbcd41cac6
 2014-09-05 16:16:39 -07:00
Vineeta Srivastava
82a3396fb9 am eee84588: am a8ceba1c: Merge "Plus code handling for non-NANP CDMA carrier" into lmp-dev 
* commit 'eee845885b88a660af79a912b3aa7062a503d361':
  Plus code handling  for non-NANP CDMA carrier
 2014-09-05 23:13:25 +00:00
Santos Cordon
a48680427e Updating APIs for CDMA conference call support. 
Bug:17316859
Change-Id: Ib80c4dcf99c8599c011496756c363c3e6147c20a
 2014-09-05 16:13:19 -07:00
Lajos Molnar
cfc102685c Merge "MediaCodecInfo: allow getting info for secure codec" into lmp-dev 2014-09-05 23:09:33 +00:00
Adam Lesinski
d26bea3a14 Returns UsageEvents from previous days 
- Avoid writing to disk when querying UsageStats.
- Use new UnixCalendar to avoid issues with Locale and TimeZone.

Bug: 16951313

Change-Id: I2473b8ef8dc1e2f6be22d4c689b96e346bdcafd5
 2014-09-05 23:09:27 +00:00
Lajos Molnar
b860155de1 Merge "MediaCodecInfo: rename createFromProfileLevel" into lmp-dev 2014-09-05 23:08:25 +00:00
Tsuwei Chen
48d37f957a Properly register all Intent filters. 
Bug: 17408889
Change-Id: Iff740def80eb50e0dc8391d7212a3ae7eeaed152
 2014-09-05 23:05:49 +00:00
Vineeta Srivastava
a5bc46388b am a8ceba1c: Merge "Plus code handling for non-NANP CDMA carrier" into lmp-dev 
* commit 'a8ceba1cb610c2ce166d4cdcbdb6eaec08886aa9':
  Plus code handling  for non-NANP CDMA carrier
 2014-09-05 23:02:48 +00:00
John Reck
f5945a0c8b Disable RT-anim for AnimatorSet 
Bug: 17317184

 Unfortunately this will disable *all* RT animations in a scene,
 but we don't have more selective targetting currently

Change-Id: I57e1c0ae43957f45229473bdcdaf34c05825fab7
 2014-09-05 15:58:26 -07:00
John Reck
07d90c4866 am fa097eea: am 4a94f088: Merge "Fix race condition" into lmp-dev 
* commit 'fa097eea8620158eef3592376afbcadca39b2e74':
  Fix race condition
 2014-09-05 22:56:49 +00:00
Svetoslav
a757f99d97 am 1458f58e: am 3b42928c: Merge "Print spooler UI polish and bug fixes." into lmp-dev 
* commit '1458f58e697e0079fc7fb90ea4094052f14a9688':
  Print spooler UI polish and bug fixes.
 2014-09-05 22:56:45 +00:00
Chris Craik
33f71d9b32 am 7ec137b7: am 6f6a8f2c: Merge "Add shadow/clipping properties to HierarchyViewer" into lmp-dev 
* commit '7ec137b7f9edb41117f822ef16bdaf5accbcc31c':
  Add shadow/clipping properties to HierarchyViewer
 2014-09-05 22:56:41 +00:00
Jean-Michel Trivi
deddda5d62 Respect Android conventions in AudioManager extras 
Update the value of the extras in android.media.AudioManager
  used in ACTION_HDMI_AUDIO_PLUG to respect the Android
  naming conventions.

Bug 17390818

Change-Id: Ied1830e0ffa3b1fa7235d0675f36f2f43aac554d
 2014-09-05 15:55:32 -07:00
Vineeta Srivastava
ac74e16cd3 Merge "Plus code handling for non-NANP CDMA carrier" into lmp-dev 2014-09-05 22:53:50 +00:00
John Reck
265437d3da am 4a94f088: Merge "Fix race condition" into lmp-dev 
* commit '4a94f088cea6e550cde6289952d5e745622db3f9':
  Fix race condition
 2014-09-05 22:45:45 +00:00
Svetoslav
ca9dde9932 am 3b42928c: Merge "Print spooler UI polish and bug fixes." into lmp-dev 
* commit '3b42928c318d2732d75bb9c0ed7b864c47a265a2':
  Print spooler UI polish and bug fixes.
 2014-09-05 22:45:40 +00:00
Chris Craik
b94670e082 am 6f6a8f2c: Merge "Add shadow/clipping properties to HierarchyViewer" into lmp-dev 
* commit '6f6a8f2c49aaf07f74310e405abc799c8d05fa19':
  Add shadow/clipping properties to HierarchyViewer
 2014-09-05 22:45:35 +00:00
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
John Reck
4e849178ef Merge "Fix race condition" into lmp-dev 2014-09-05 22:38:42 +00:00
Shishir Agrawal
d2cfa92146 API change: SetOperatorBrandOverride should not take iccId as a param. 
Taking ICCID as a parameter is not scure since a carrier can override the
brand for other carriers. We should override only the current ICCID.

Bug: 17390144

Change-Id: I9be2cb5c5fa15367fcb3b548b6e601a294e84dbc
 2014-09-05 15:37:44 -07:00
Svetoslav
d89c5ad3d3 Merge "Print spooler UI polish and bug fixes." into lmp-dev 2014-09-05 22:37:39 +00:00
Chris Craik
83eb430270 Merge "Add shadow/clipping properties to HierarchyViewer" into lmp-dev 2014-09-05 22:36:41 +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
Jean-Michel Trivi
8aacb2e96c AudioAttributes: unhide CREATOR 
android.media.AudioAttributes implements the Parcelable interface,
 and is part of the SDK, it therefore requires CREATOR, writeToParcel,
 and describeContents to be "unhidden".
CREATOR was still @hide

Bug 17390818

Change-Id: I9c1cb1d454fe538cb5be6066ebed290a99352da9
 2014-09-05 22:30:36 +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
John Reck
ec845a215e Fix race condition 
Bug: 17372309

 AnimationContext::startFrame() happens both with and without
 the UI thread lock. Pass the TraversalMode into it so
 that ThreadedRenderer's subclass can correctly decide
 when it is safe to push over mPendingAnimatingRenderNodes, as doing
 so outside of the lock is Very Bad.

Change-Id: Ife5dd3a2b46b0a207cd9234c159a674afdbf5efd
 2014-09-05 15:23:38 -07:00
Chris Craik
5c75c52e04 Add shadow/clipping properties to HierarchyViewer 
bug:15777980

Change-Id: Ic3d24326f585d2d2b9889486f0ed322eb98b5af8
 2014-09-05 15:23:08 -07: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