Brian Carlstrom
233baedce8
am 686a1b2f: am 165c2564: Merge "Manually add SignalStrength to preloaded-classes"
...
* commit '686a1b2f4ac90c3fb522405258212c8a91ed5148':
Manually add SignalStrength to preloaded-classes
2015-03-05 06:27:40 +00:00
smain@google.com
b488a25630
am 4f674bbd: am 8b2be54a: am 182059f8: am ca10a435: am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
...
* commit '4f674bbdf83056141f3dccf1af8af3113e17af87':
add tags for wakelock and other API names
2015-03-05 06:25:43 +00:00
Brian Carlstrom
686a1b2f4a
am 165c2564: Merge "Manually add SignalStrength to preloaded-classes"
...
* commit '165c25641ccedf6447d09dfec00f485df1361c35':
Manually add SignalStrength to preloaded-classes
2015-03-05 06:22:18 +00:00
smain@google.com
4f674bbdf8
am 8b2be54a: am 182059f8: am ca10a435: am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
...
* commit '8b2be54a629e4567152d8b0e6c81332632b0b877':
add tags for wakelock and other API names
2015-03-05 06:18:45 +00:00
Brian Carlstrom
165c25641c
Merge "Manually add SignalStrength to preloaded-classes"
2015-03-05 06:15:53 +00:00
smain@google.com
8b2be54a62
am 182059f8: am ca10a435: am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
...
* commit '182059f875bedc778a3ce9710a4f634197d1e959':
add tags for wakelock and other API names
2015-03-05 06:10:54 +00:00
Brian Carlstrom
0b36620014
Manually add SignalStrength to preloaded-classes
...
Bug: 19323020
Change-Id: I61e9d2dd5d06fe2353da17e5646f259122e5ea98
2015-03-04 21:56:26 -08:00
Brian Attwell
643db51d4e
Prioritize regular names over phonetic names. P1
...
Bug: 19587274
Change-Id: I503c0fff6da30b9f1d6b6cbeaedfc4d9314f8a00
2015-03-05 05:54:04 +00:00
Anthony Hugh
1569f98ce1
am 7b737c80: am 097f8d5f: Merge "Update "Optimizing app X from Y string"" into lmp-mr1-modular-dev
...
* commit '7b737c809d95343ebf18d68dd9f503f5efe127be':
Update "Optimizing app X from Y string"
2015-03-05 04:14:06 +00:00
Anthony Hugh
7b737c809d
am 097f8d5f: Merge "Update "Optimizing app X from Y string"" into lmp-mr1-modular-dev
...
* commit '097f8d5f6b82f27e71ec72795dee053dfc698ac5':
Update "Optimizing app X from Y string"
2015-03-05 04:08:32 +00:00
Anthony Hugh
097f8d5f6b
Merge "Update "Optimizing app X from Y string"" into lmp-mr1-modular-dev
2015-03-05 04:04:06 +00:00
Jinsuk Kim
2da02a2021
Merge "CEC: Do not start queued actions for TV device"
2015-03-05 03:44:49 +00:00
Eric Gilmore
b0b9c3617e
am 76120308: am 8edf64e9: am 28d11557: am 498691d2: am 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs
...
* commit '761203089d46a208000140a1090deb7b6c8c8356':
Fixing broken link per b/19503824.
2015-03-05 01:53:38 +00:00
Bart Sears
d1e947313b
am 1445dec7: am 5a1cec86: am 0c3052a6: am 4eedcceb: Merge "Merge commit \'83a63bac\' into manualmerge" into lmp-mr1-dev
...
* commit '1445dec74f0411206e8964d4efbf01668a791e2e':
Do not make ActivityContainer available to apps. DO NOT MERGE
2015-03-05 01:29:43 +00:00
Lajos Molnar
63834f4d23
media: update AMessage to use handler instead of handler-id
...
Bug: 19607784
Change-Id: Ia18746830816bcade510e5137bf8ce6258181ac0
2015-03-04 17:17:03 -08:00
Andreas Gampe
f9345e93db
Frameworks/base: Add removeAll for ArraySet
...
Add a simple ArraySet.removeAll(ArraySet) method. This avoids two
allocations, a MapCollections helper and an Iterator object, over
the removeAll(Collection) code.
KeySetManagerService heavily calls removeAll during boot (about 9K
times in AOSP). This reduces GC stress and optimizes the removal
(about half the time the removed collection has only one element).
The removal method in KeySetManagerService is also done under a lock,
so that it gates parallelization efforts in PackageManagerService.
Bug: 19498314
Change-Id: Ib0e483adfd09831cd66ab19a820ebf6544a2b66f
2015-03-04 17:14:10 -08:00
smain@google.com
182059f875
am ca10a435: am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
...
* commit 'ca10a4352f07652d82da59f6c1630e8607d82dda':
add tags for wakelock and other API names
2015-03-05 01:12:15 +00:00
Eric Gilmore
761203089d
am 8edf64e9: am 28d11557: am 498691d2: am 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs
...
* commit '8edf64e9e903f2dcd54d52b74ef1bbfefcbbca3d':
Fixing broken link per b/19503824.
2015-03-05 01:10:56 +00:00
Eric Gilmore
8edf64e9e9
am 28d11557: am 498691d2: am 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs
...
* commit '28d11557d6846e7ea7fb2593a6ed4d3a16f5eef6':
Fixing broken link per b/19503824.
2015-03-05 01:02:55 +00:00
smain@google.com
ca10a4352f
am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
...
* commit 'f4bbec09a4c3795bc72d6a95aab3488c6c49ce6e':
add tags for wakelock and other API names
2015-03-05 00:59:24 +00:00
Bart Sears
1445dec74f
am 5a1cec86: am 0c3052a6: am 4eedcceb: Merge "Merge commit \'83a63bac\' into manualmerge" into lmp-mr1-dev
...
* commit '5a1cec86cfb3f08fac06ed26fe81247c3415d3ca':
Do not make ActivityContainer available to apps. DO NOT MERGE
2015-03-05 00:59:01 +00:00
Eric Gilmore
28d11557d6
am 498691d2: am 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs
...
* commit '498691d2641deb1ca30938c7777a9a63882ffd87':
Fixing broken link per b/19503824.
2015-03-05 00:55:38 +00:00
Bart Sears
5a1cec86cf
am 0c3052a6: am 4eedcceb: Merge "Merge commit \'83a63bac\' into manualmerge" into lmp-mr1-dev
...
* commit '0c3052a6675ed528c2898bd2ecb92576bca78df9':
Do not make ActivityContainer available to apps. DO NOT MERGE
2015-03-05 00:52:58 +00:00
smain@google.com
f4bbec09a4
Merge "add tags for wakelock and other API names" into lmp-docs
2015-03-05 00:49:49 +00:00
Eric Gilmore
498691d264
am 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs
...
* commit '62777b189dc31c250c4ae06915aae0a337950e1c':
Fixing broken link per b/19503824.
2015-03-05 00:49:21 +00:00
Bart Sears
0c3052a667
am 4eedcceb: Merge "Merge commit \'83a63bac\' into manualmerge" into lmp-mr1-dev
...
* commit '4eedccebb7f4c3f9e2f1890f92bead4b9c2a9819':
Do not make ActivityContainer available to apps. DO NOT MERGE
2015-03-05 00:40:13 +00:00
Bart Sears
4eedccebb7
Merge "Merge commit '83a63bac' into manualmerge" into lmp-mr1-dev
2015-03-05 00:35:08 +00:00
Tucker Sylvestro
60b9a5e773
am 80cb7300: (-s ours) am 5a6b44c4: (-s ours) Merge "DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (3/4)" into lmp-mr1-modular-dev
...
* commit '80cb73006d6c14f9a9cd506172d9223cbca8606f':
DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (3/4)
2015-03-05 00:32:51 +00:00
Tucker Sylvestro
80cb73006d
am 5a6b44c4: (-s ours) Merge "DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (3/4)" into lmp-mr1-modular-dev
...
* commit '5a6b44c435fb06817a66bb74c66a5a6d19690616':
DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (3/4)
2015-03-05 00:27:13 +00:00
Tucker Sylvestro
5a6b44c435
Merge "DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (3/4)" into lmp-mr1-modular-dev
2015-03-05 00:15:08 +00:00
Anthony Hugh
6550bf5e39
Update "Optimizing app X from Y string"
...
The word "Optimizing" is rendering on two lines on Lenok due to being too
long. New design is to shorten the string on watches to avoid this issue.
BUG: 18388692
BUG: 18902013
BUG: 16493311
Change-Id: I8d9a9e8fcade460e50f9bf71d5cb0c6e415f871e
2015-03-04 16:12:08 -08:00
Adam Powell
27b7c1f526
Merge "Add ChooserTargetService API"
2015-03-05 00:07:53 +00:00
Mike Lockwood
c623ec973b
Merge "MidiManager: Virtual MIDI devices are now implemented as Services"
2015-03-05 00:01:33 +00:00
Chris Craik
ef7aa4fc19
Merge "Patch cleanup, reenable Patch Glops"
2015-03-04 23:41:42 +00:00
Chris Craik
8820fd1d82
Patch cleanup, reenable Patch Glops
...
bug:19597454
Change-Id: If12b95e83588b81a553210cd8c2437c6c771073a
2015-03-04 15:32:47 -08:00
John Spurlock
f0f293f0fa
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base
2015-03-04 23:26:01 +00:00
Glenn Kasten
fad60c343a
Merge "soundpool: update sample rate when reusing audiotrack"
2015-03-04 23:25:28 +00:00
Glenn Kasten
9e9e2f7014
Merge "soundpool: reuse channel for same sample if available"
2015-03-04 23:25:03 +00:00
John Spurlock
1bea125ca8
am 3bedeb01: am bd438742: am b879e739: am c974ac11: MediaProjectionPermissionActivity: Fix NPE.
...
* commit '3bedeb010103f4da26241c23929aa38598758f93':
MediaProjectionPermissionActivity: Fix NPE.
2015-03-04 23:24:53 +00:00
John Spurlock
3bedeb0101
am bd438742: am b879e739: am c974ac11: MediaProjectionPermissionActivity: Fix NPE.
...
* commit 'bd438742870a51eacea3554376f671bd1be0e30c':
MediaProjectionPermissionActivity: Fix NPE.
2015-03-04 23:15:51 +00:00
Andrew Lee
67fc92bd44
Add methods for device telephony configs.
...
+ Expose method for whether DTMF length can be changed.
+ Expose method for whether the device is a world phone.
Bug: 19372734
Change-Id: I542e87cab1924eb600fdce929f5227e36112964b
2015-03-04 15:12:18 -08:00
John Spurlock
bd43874287
am b879e739: am c974ac11: MediaProjectionPermissionActivity: Fix NPE.
...
* commit 'b879e7395fa9446952b840b1d576ff225b039774':
MediaProjectionPermissionActivity: Fix NPE.
2015-03-04 23:09:19 +00:00
John Spurlock
b879e7395f
am c974ac11: MediaProjectionPermissionActivity: Fix NPE.
...
* commit 'c974ac11f808968648d26e83a0b64a7fba02ad15':
MediaProjectionPermissionActivity: Fix NPE.
2015-03-04 23:01:26 +00:00
John Spurlock
75328b703f
Merge "Audio: Remove the concept of master volume."
2015-03-04 22:59:41 +00:00
John Spurlock
ee5ad729b9
Audio: Remove the concept of master volume.
...
- Remove two config resources (use master volume, and volume ramp).
- Remove master volume adjustments / getters / intents.
- Retain @hidden setMasterMute, needed for device admin
- Remove master volume logic in AudioService.
- Remove master volume logic in VolumePanel.
- Rename "getMasterStreamType" to "getUiSoundsStreamType" to avoid confusion.
Bug: 19582978
Change-Id: Id02c8fa4898cff3b913147f5ac1b4038e2e7cc24
2015-03-04 17:51:44 -05:00
Julia Reynolds
a9b33ddf31
Merge "DOs can clear the DI; rehide hasUserSetupCompleted."
2015-03-04 22:38:23 +00:00
Julia Reynolds
e925440a55
DOs can clear the DI; rehide hasUserSetupCompleted.
...
Bug: 19230954
Change-Id: I97467229b23f3c9be1c3c4fff1c888a812f14a95
2015-03-04 17:36:00 -05:00
Chris Craik
92c2ca9526
Merge "Temporarily disable Patch glops"
2015-03-04 22:31:00 +00:00
Raph Levien
35091569b9
Merge "Some refactoring of StaticLayout"
2015-03-04 22:28:19 +00:00
Chris Craik
a9761e698e
Temporarily disable Patch glops
...
bug:19597454
Change-Id: I9dbe781a714582717a5585113b9a56821265b36e
2015-03-04 14:25:10 -08:00