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

150380 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
5b7be93d15 am c0b09353: Merge "Simplify ripple background drawing, fix ripple alphas" into lmp-dev 
* commit 'c0b093530336a9016acfbb333dbd35784c2cf60a':
  Simplify ripple background drawing, fix ripple alphas
 2014-09-05 23:58:06 +00:00
Alan Viverette
e9921370d7 Merge "Simplify ripple background drawing, fix ripple alphas" into lmp-dev 2014-09-05 23:45:36 +00:00
Jean-Michel Trivi
1ea0e61c23 am 2a56275e: Merge "Respect Android conventions in AudioManager extras" into lmp-dev 
* commit '2a56275e4f09d0bd7e2b50d694686ff3f15357a2':
  Respect Android conventions in AudioManager extras
 2014-09-05 23:44:13 +00:00
Jean-Michel Trivi
e4df97c32c am 1c01afc0: Merge "AudioAttributes: unhide CREATOR" into lmp-dev 
* commit '1c01afc06ed47fbd983bc8e7c52851d0518021d7':
  AudioAttributes: unhide CREATOR
 2014-09-05 23:44:10 +00:00
Jeff Sharkey
16da11eb9e am 89e86555: Merge "Separate active state from open/close." into lmp-dev 
* commit '89e865552f42db5cc31ef48ad35f3392e4ed1ac2':
  Separate active state from open/close.
 2014-09-05 23:38:00 +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
f90c3c3a83 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:28 +00:00
Lajos Molnar
1f2023c2e4 am fd03c56c: Merge "MediaCodecInfo: rename createFromProfileLevel" into lmp-dev 
* commit 'fd03c56cbb2be8db4f381c8459d405129e92e569':
  MediaCodecInfo: rename createFromProfileLevel
 2014-09-05 23:19:25 +00: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
Lajos Molnar
cfc102685c Merge "MediaCodecInfo: allow getting info for secure codec" into lmp-dev 2014-09-05 23:09:33 +00:00
Lajos Molnar
b860155de1 Merge "MediaCodecInfo: rename createFromProfileLevel" into lmp-dev 2014-09-05 23:08:25 +00:00
Vineeta Srivastava
e30eeb5f56 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:03:22 +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
5694db3ba9 am 4a94f088: Merge "Fix race condition" into lmp-dev 
* commit '4a94f088cea6e550cde6289952d5e745622db3f9':
  Fix race condition
 2014-09-05 22:45:54 +00:00
Svetoslav
acc90bd72a 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:50 +00:00
Chris Craik
ce1a912e34 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:47 +00:00
John Reck
4e849178ef Merge "Fix race condition" into lmp-dev 2014-09-05 22:38:42 +00: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
845f4b7663 am fc005f52: Merge "Unescape strings properly in NsdService." into lmp-dev 
* commit 'fc005f52578ed9fa3ea34fa5f29085b25a9ff566':
  Unescape strings properly in NsdService.
 2014-09-05 22:35:30 +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
9a07441d8a am 51a66814: Merge "Don\'t crash in addPackageHoldingPermissions()..." into lmp-dev 
* commit '51a66814c9520658f697470bce342ea10ee4d3a5':
  Don't crash in addPackageHoldingPermissions()...
 2014-09-05 22:27:25 +00:00
Chris Craik
e00c9b3b72 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:21 +00:00
dcashman
c7d4686133 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:17 +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
Svetoslav
6552bf3da6 Print spooler UI polish and bug fixes. 
1. Added an empty state for pages that are being rendered.

2. Fixed a NPA on a binder thread when destoroying the
   remote print adapter.

3. Fixed a rare crash when the print activity gets an
   activity class callback while initializing.

4. Changed the preview pages on phone in land to four.

5. Fixed a flicker from a list of pages to an empty state
   and then back to the list of pages.

bug:15704969
bug:16966145

Change-Id: I0eea2f30a102d8fefcbf90187fa6d8612fb19434

Conflicts:
	packages/PrintSpooler/src/com/android/printspooler/widget/PageContentView.java
 2014-09-05 15:21:50 -07: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
Steven Liu
9b656ee320 Plus code handling for non-NANP CDMA carrier 
Since most of CDMA network do not support phone number with "+" for
international dialing, current AOSP support the "+" handling for
NANP CDMA network, this part add the support for non-NANP CDMA Network,
convert "+" to right IDD(International Direct Dialing) code. And adding
a new property for current IDD.

Bug: 17210134

Change-Id: I369083169bb3504f8de9774b65f3993dd561c525
 2014-09-05 22:13:11 +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
Griff Hazen
c37c9708c3 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 21:58:25 +00:00
Nancy Chen
eec15f90e7 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:47 +00:00
Griff Hazen
69dd40d08a Merge "Reduce chance of notification listener dropped messages." into lmp-dev 2014-09-05 21:52:44 +00:00
Jean-Michel Trivi
91488f464d 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:47:31 +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
e55634c087 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:27 +00:00
Jae Seo
1e25b1f8a8 am caf3c12c: Merge "API review: android.media.tv" into lmp-dev 
* commit 'caf3c12ca1ee420acdbb0181ffe5a0497ce84af3':
  API review: android.media.tv
 2014-09-05 21:05:23 +00:00
Aravind Akella
65e74377d9 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
9e349078ab 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