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

165835 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
9f08a9f08a Merge "Improve toString() methods for audio classes to help with debugging" into lmp-mr1-dev 
automerge: ac7d8c5

* commit 'ac7d8c5cc85dc5929b5d1c9d7836aca58a4e9ea5':
  Improve toString() methods for audio classes to help with debugging
 2014-10-27 22:18:05 +00:00
Jeff Sharkey
817722bb36 Merge "Follow ArraySet refactoring." into lmp-mr1-dev 
automerge: 9c81373

* commit '9c81373bc99dd97c3e89138b008ea4c5c77c9b47':
  Follow ArraySet refactoring.
 2014-10-27 22:16:59 +00:00
Jeff Sharkey
a5921b9b79 Merge "Drop DEV network stats to save RAM." into lmp-mr1-dev 
automerge: 49c1527

* commit '49c1527cd530d880b37c2f0becf57043740b491c':
  Drop DEV network stats to save RAM.
 2014-10-27 22:14:44 +00:00
Jeff Sharkey
d634d39c60 Merge "Follow API removal." into lmp-mr1-dev 2014-10-27 22:01:58 +00:00
Lajos Molnar
5ea17442c5 MediaCodec/Image: handle null cropRect correctly 
- allow Media.Image.setCropRect(null) to unset cropRect
- use full image if cropRect is null in MediaCodec$Image

Bug: 18124320
Change-Id: I7abb6175402a1fe913e16c0a682fabee79c55741
 2014-10-27 14:58:26 -07:00
Jeff Sharkey
cff1d67339 Follow API removal. 
Bug: 18118003
Change-Id: Iad73ce748e05ba0660246e8dbb041415c187f792
 2014-10-27 14:53:40 -07:00
Quddus Chong
2b4b3d289b cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce 
Change-Id: Ic7402251219a84be92d4e58863fd069de6aa4446
 2014-10-27 14:47:50 -07:00
Craig Mautner
fa3515bd0d Do not go through a layout if visibility is GONE 
An unnecessary layout based on dimensions changing catches up
with us later when the next layout doesn't occur.

In this case
we layed out the Settings panel because visibility changed from
visible to GONE and the requested width/height didn't match the
current window width height. When the visibility changed back
to visible the dimensions matched and another layout was not
performed.

This fix delays the layout until the window becomes visible again.

Fixes bug 17681754.

Change-Id: I0a3ff9479dca93e78c5d3a3df40faceffc10ecbd
 2014-10-27 14:46:27 -07:00
Dake Gu
54aad95336 am 4c2e3491: Merge "ActivityTransition: Encode scaleType and matrix in snapshot view" into lmp-mr1-dev 
automerge: 63964d9

* commit '63964d9eae11b79e3d50ee5f3cc79b08050653fe':
  ActivityTransition: Encode scaleType and matrix in snapshot view
 2014-10-27 21:34:58 +00:00
Jeff Sharkey
1c6659486c am e67b8d28: Merge "Reduce PackageManager RAM usage: ArrayMap/Set." into lmp-mr1-dev 
automerge: 301b563

* commit '301b563107c7458a21e4460254e81694b45f0e35':
  Reduce PackageManager RAM usage: ArrayMap/Set.
 2014-10-27 21:33:55 +00:00
Eric Laurent
4ec1d430db am 670a82cb: Merge "audioservice: fix default stream volume" into lmp-mr1-dev 
automerge: af93061

* commit 'af9306149323120d8098f5fdef15b923e36d9569':
  audioservice: fix default stream volume
 2014-10-27 21:32:52 +00:00
Jeff Hao
2b8a1b38ec am e8d9810c: Merge "Get UsageStats if no PackageUsage is available for boot dexopt filtering." into lmp-mr1-dev 
automerge: ad1a613

* commit 'ad1a613c5291af54df0a26cf5c34434079782692':
  Get UsageStats if no PackageUsage is available for boot dexopt filtering.
 2014-10-27 21:31:54 +00:00
Wink Saville
ae85478d3d am 4dec130c: Merge "Change subId to int from long" into lmp-mr1-dev 
automerge: e5b4c12

* commit 'e5b4c1219a32a086508d83101c10605dd894e4d2':
  Change subId to int from long
 2014-10-27 21:30:48 +00:00
Evan Charlton
4d4b2cfd4c am 2ad5eb53: Merge "Move telecom permission to the public API" into lmp-mr1-dev 
automerge: 8e25057

* commit '8e2505760c7d06823717c1d394bf323db0dd0caa':
  Move telecom permission to the public API
 2014-10-27 21:29:55 +00:00
Geoff Mendal
47545d4777 am 649fee03: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev automerge: 5a1a14a -s ours 
automerge: 39545fc  -s ours

* commit '39545fce48e41a3de73df3b6a423c43e72d49457':
  Import translations. DO NOT MERGE
 2014-10-27 21:29:03 +00:00
Geoff Mendal
a3983b27e6 am 496f0ea6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
automerge: e5661ee  -s ours

* commit 'e5661ee3deb18c060b36fd12ee88ca37ec25fdda':
  Import translations. DO NOT MERGE
 2014-10-27 21:28:04 +00:00
Adrian Roos
b3726de168 am 4bc3c8bd: Merge "SampleTrustAgent: Exercise KeyguardManager.isKeyguardInTrustedState" into lmp-mr1-dev 
automerge: f9b36d5

* commit 'f9b36d5ef94c92a66c08167d5e7e911e5ea8c645':
  SampleTrustAgent: Exercise KeyguardManager.isKeyguardInTrustedState
 2014-10-27 21:27:01 +00:00
Jorim Jaggi
f53bc26f4e am f129ee37: Merge "Fix padding between battery and system icons" into lmp-mr1-dev 
automerge: 97f1a97

* commit '97f1a97d89366159374c2be3d74e0642705d80bf':
  Fix padding between battery and system icons
 2014-10-27 21:25:59 +00:00
George Mount
eca1ae5e44 Fix NPE in moveSharedElementsToOverlay 
Bug 18119532

Change-Id: I334bda2d63427032583a15a483e000412024c150
 2014-10-27 14:25:12 -07:00
Jorim Jaggi
7157ce9e94 am 9016d8fa: Merge "Fix system icon widths" into lmp-mr1-dev 
automerge: 876820e

* commit '876820eb670936815e9064f816a8ce14bda64455':
  Fix system icon widths
 2014-10-27 21:24:41 +00:00
Jorim Jaggi
05e7c26b0d am 312c1e79: Merge "Add padding when both data icon and wifi icon is visible" into lmp-mr1-dev 
automerge: 286f361

* commit '286f36112e424a173a5a57f881545045c54ec76b':
  Add padding when both data icon and wifi icon is visible
 2014-10-27 21:23:43 +00:00
George Mount
06e74b30ae am e0f76e9a: Merge "Fix transition being canceled improperly." into lmp-mr1-dev 
automerge: 7b042be

* commit '7b042be5e2975eddf1da915be052ad70fc07c115':
  Fix transition being canceled improperly.
 2014-10-27 21:22:49 +00:00
George Mount
8b92704f02 am 03d5c6f5: Merge "Add resizeClip attribute to ChangeBounds." into lmp-mr1-dev 
automerge: 3437192

* commit '34371925470e43dfe1b194fd3f6d0b942f13f1bd':
  Add resizeClip attribute to ChangeBounds.
 2014-10-27 21:21:18 +00:00
Mike Lockwood
ac7d8c5cc8 Merge "Improve toString() methods for audio classes to help with debugging" into lmp-mr1-dev 2014-10-27 21:10:22 +00:00
Mike Lockwood
07cd124b09 Improve toString() methods for audio classes to help with debugging 
bug: 18139399

Change-Id: I6076f9f5daa3b485bc80a4ff1b16a583e6c93f67
 2014-10-27 14:07:35 -07:00
Jeff Sharkey
9c81373bc9 Merge "Follow ArraySet refactoring." into lmp-mr1-dev 2014-10-27 21:02:08 +00:00
Jeff Sharkey
036ebd782c Follow ArraySet refactoring. 
Bug: 18115729
Change-Id: I2c32965b621b5bb57ff3bde02b00b31b59a5cd6d
 2014-10-27 13:51:23 -07:00
Jeff Sharkey
49c1527cd5 Merge "Drop DEV network stats to save RAM." into lmp-mr1-dev 2014-10-27 20:38:06 +00:00
Dake Gu
63964d9eae am 4c2e3491: Merge "ActivityTransition: Encode scaleType and matrix in snapshot view" into lmp-mr1-dev 
* commit '4c2e3491ec6cf20bcf95a922f396473e33bc4e98':
  ActivityTransition: Encode scaleType and matrix in snapshot view
 2014-10-27 20:37:03 +00:00
Jeff Sharkey
301b563107 am e67b8d28: Merge "Reduce PackageManager RAM usage: ArrayMap/Set." into lmp-mr1-dev 
* commit 'e67b8d28294d9af440d2ea23f1b2c68dfcba8b1b':
  Reduce PackageManager RAM usage: ArrayMap/Set.
 2014-10-27 20:36:59 +00:00
Eric Laurent
af93061493 am 670a82cb: Merge "audioservice: fix default stream volume" into lmp-mr1-dev 
* commit '670a82cbb1b62e69fa7ef7387eed545a76c96f76':
  audioservice: fix default stream volume
 2014-10-27 20:36:54 +00:00
Jeff Hao
ad1a613c52 am e8d9810c: Merge "Get UsageStats if no PackageUsage is available for boot dexopt filtering." into lmp-mr1-dev 
* commit 'e8d9810cdef5b3e288f54f42adc3205532343406':
  Get UsageStats if no PackageUsage is available for boot dexopt filtering.
 2014-10-27 20:36:49 +00:00
Wink Saville
e5b4c1219a am 4dec130c: Merge "Change subId to int from long" into lmp-mr1-dev 
* commit '4dec130c396b95c888b52693796f790205d374e7':
  Change subId to int from long
 2014-10-27 20:36:44 +00:00
Evan Charlton
8e2505760c am 2ad5eb53: Merge "Move telecom permission to the public API" into lmp-mr1-dev 
* commit '2ad5eb538ddddb56fe96482a644c0519156bf2bd':
  Move telecom permission to the public API
 2014-10-27 20:36:39 +00:00
Geoff Mendal
39545fce48 am 649fee03: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev automerge: 5a1a14a -s ours 
* commit '649fee03263decf9df12db01f02cf77779a388ce':
  Import translations. DO NOT MERGE
 2014-10-27 20:36:35 +00:00
Geoff Mendal
e5661ee3de am 496f0ea6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '496f0ea68ae043dd8fd26b8a9577c496e25083c0':
  Import translations. DO NOT MERGE
 2014-10-27 20:36:30 +00:00
Adrian Roos
f9b36d5ef9 am 4bc3c8bd: Merge "SampleTrustAgent: Exercise KeyguardManager.isKeyguardInTrustedState" into lmp-mr1-dev 
* commit '4bc3c8bd643ca6840bf5b3fe01d8221f3a389d96':
  SampleTrustAgent: Exercise KeyguardManager.isKeyguardInTrustedState
 2014-10-27 20:36:25 +00:00
Jorim Jaggi
97f1a97d89 am f129ee37: Merge "Fix padding between battery and system icons" into lmp-mr1-dev 
* commit 'f129ee377ab2771a5159fde9208da8c26207d41b':
  Fix padding between battery and system icons
 2014-10-27 20:36:20 +00:00
Jorim Jaggi
876820eb67 am 9016d8fa: Merge "Fix system icon widths" into lmp-mr1-dev 
* commit '9016d8fa80d1f3d17c612fdc7edcfabb70b1c29e':
  Fix system icon widths
 2014-10-27 20:36:16 +00:00
Jorim Jaggi
286f36112e am 312c1e79: Merge "Add padding when both data icon and wifi icon is visible" into lmp-mr1-dev 
* commit '312c1e79d49a1ce7f7202f3bedb3a8d1fa110e4d':
  Add padding when both data icon and wifi icon is visible
 2014-10-27 20:36:10 +00:00
George Mount
7b042be5e2 am e0f76e9a: Merge "Fix transition being canceled improperly." into lmp-mr1-dev 
* commit 'e0f76e9a6d352c45a1729b99ea0df59bd4359423':
  Fix transition being canceled improperly.
 2014-10-27 20:36:05 +00:00
George Mount
3437192547 am 03d5c6f5: Merge "Add resizeClip attribute to ChangeBounds." into lmp-mr1-dev 
* commit '03d5c6f55b316a5b0e1aae405077d1083df60b36':
  Add resizeClip attribute to ChangeBounds.
 2014-10-27 20:35:59 +00:00
Dake Gu
4c2e3491ec Merge "ActivityTransition: Encode scaleType and matrix in snapshot view" into lmp-mr1-dev 2014-10-27 20:23:28 +00:00
John Reck
950ff1b88c Be more conservative about current buffer 
Bug: 18065565
Change-Id: I0b9c85ecf384ebe525e3a38803ab77d7ee37f33a
 2014-10-27 13:23:20 -07:00
Jeff Sharkey
e67b8d2829 Merge "Reduce PackageManager RAM usage: ArrayMap/Set." into lmp-mr1-dev 2014-10-27 19:57:00 +00:00
John Reck
23d307c8d8 Cleanup debug options 
Bug: 18138852
Bug: 18065434
Change-Id: Ibb07b73b147c2a8b287fe8aee3f6624582f21b00
 2014-10-27 12:43:25 -07:00
Eric Laurent
670a82cbb1 Merge "audioservice: fix default stream volume" into lmp-mr1-dev 2014-10-27 19:40:30 +00:00
winsonchung
f14fdda212 Fixing potential crash when the task loader is stopped. (Bug 18135583) 
Change-Id: I44f766e52f05c38a1b6c4a2e7942e3d6ecaae501
 2014-10-27 12:08:54 -07:00
Chih-Hung Hsieh
3028394c46 Merge "Suppress Clang compilation warnings." 2014-10-27 18:36:52 +00:00
Ying Wang
79775d4bc4 Update current.txt with generics to field types. 
Bug: 17014855
Change-Id: I14672092f79374f6c5b2362bd3c2aaac84e0c2ae
 2014-10-27 11:25:19 -07:00