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

165481 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Jeff Sharkey
e67b8d2829 Merge "Reduce PackageManager RAM usage: ArrayMap/Set." into lmp-mr1-dev 2014-10-27 19:57:00 +00:00
Eric Laurent
670a82cbb1 Merge "audioservice: fix default stream volume" into lmp-mr1-dev 2014-10-27 19:40:30 +00:00
Jeff Hao
e8d9810cde Merge "Get UsageStats if no PackageUsage is available for boot dexopt filtering." into lmp-mr1-dev 2014-10-27 17:46:23 +00:00
Wink Saville
4dec130c39 Merge "Change subId to int from long" into lmp-mr1-dev 2014-10-27 17:34:47 +00:00
Eric Laurent
91377de6f2 audioservice: fix default stream volume 
When the max stream volume is configurable by
a system property, the default stream volume should
be set accordingly.

Bug: 17507571.

Change-Id: I9d9378292fc7b9c9e32acc55a275cc0ae5b203d4
 2014-10-27 10:13:00 -07:00
Evan Charlton
2ad5eb538d Merge "Move telecom permission to the public API" into lmp-mr1-dev 2014-10-27 17:08:33 +00:00
Geoff Mendal
649fee0326 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
automerge: 5a1a14a  -s ours

* commit '5a1a14a8174213edcd5f1d7f8fbc427122b25f99':
  Import translations. DO NOT MERGE
 2014-10-27 16:42:51 +00:00
Geoff Mendal
2781409191 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
automerge: 4d785f1  -s ours

* commit '4d785f1a033cfd4d5261b3493b6d8153b1a5d596':
  Import translations. DO NOT MERGE
 2014-10-27 16:30:07 +00:00
Geoff Mendal
5a1a14a817 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-27 15:55:19 +00:00
Geoff Mendal
ad66c3b0b1 Import translations. DO NOT MERGE 
Change-Id: I4fc460aa64d5ea79e6ac16ce7b700b9a316819d1
Auto-generated-cl: translation import
 2014-10-27 08:53:05 -07:00
Geoff Mendal
4d785f1a03 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-10-27 15:51:29 +00:00
Geoff Mendal
496f0ea68a Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-27 15:50:38 +00:00
Geoff Mendal
935bc33693 Import translations. DO NOT MERGE 
Change-Id: Iff4ddd0201aae07d5a847087ba53cd50aa1ba5c3
Auto-generated-cl: translation import
 2014-10-27 08:48:48 -07:00
Geoff Mendal
592931437c Import translations. DO NOT MERGE 
Change-Id: I05a75d27b0c7752e6afc0d51169e82f7547607df
Auto-generated-cl: translation import
 2014-10-27 08:47:13 -07:00
Adrian Roos
4bc3c8bd64 Merge "SampleTrustAgent: Exercise KeyguardManager.isKeyguardInTrustedState" into lmp-mr1-dev 2014-10-27 14:32:20 +00:00
Jorim Jaggi
f129ee377a Merge "Fix padding between battery and system icons" into lmp-mr1-dev 2014-10-27 14:32:15 +00:00
Jorim Jaggi
9016d8fa80 Merge "Fix system icon widths" into lmp-mr1-dev 2014-10-27 14:31:54 +00:00
Jorim Jaggi
312c1e79d4 Merge "Add padding when both data icon and wifi icon is visible" into lmp-mr1-dev 2014-10-27 14:31:33 +00:00
George Mount
e0f76e9a6d Merge "Fix transition being canceled improperly." into lmp-mr1-dev 2014-10-27 14:31:29 +00:00
George Mount
03d5c6f55b Merge "Add resizeClip attribute to ChangeBounds." into lmp-mr1-dev 2014-10-27 14:30:34 +00:00
Geoff Mendal
df70dc51ce am 323995c9: (-s ours) am 088260d3: (-s ours) am b3a33967: (-s ours) Import translations. DO NOT MERGE 
* commit '323995c99e5f61e50ab59350ae919c2715857dcf':
  Import translations. DO NOT MERGE
 2014-10-27 13:59:41 +00:00
Geoff Mendal
323995c99e am 088260d3: (-s ours) am b3a33967: (-s ours) Import translations. DO NOT MERGE 
* commit '088260d3a7548489c497628585c94077b934f789':
  Import translations. DO NOT MERGE
 2014-10-27 13:54:12 +00:00
Geoff Mendal
088260d3a7 am b3a33967: (-s ours) Import translations. DO NOT MERGE 
* commit 'b3a33967d2496e8cb9e4174392ff8ffa44d41c8f':
  Import translations. DO NOT MERGE
 2014-10-27 13:47:56 +00:00
John Spurlock
65c0d6ad0c am 14882cf3: am e828b6c0: Merge "AudioService: Restore ringer-mode validation check." into lmp-mr1-dev 
* commit '14882cf3773c7c142c9a8aa4eb7c95a80e5711f9':
  AudioService: Restore ringer-mode validation check.
 2014-10-27 13:41:18 +00:00