Glenn Kasten
e442d914b8
am ad97ca81: am 4c0b2345: am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos
...
* commit 'ad97ca8188f246c9c902f42749b93fd67b93aee2':
Fix USB typos
2015-03-09 15:44:52 +00:00
Glenn Kasten
18c225d054
Revert "soundpool: reuse channel for same sample if available"
...
This reverts commit 570576b51b8123ab05b36707ec752cf966292ca5.
Bug: 19635137
Change-Id: I8385ac4c151a375c19c3606698081c947b6216e3
2015-03-09 08:40:12 -07:00
Glenn Kasten
b801f73343
Revert "soundpool: update sample rate when reusing audiotrack"
...
This reverts commit a7d57a6f0068b1e2a0f07ca427cfba198b12a9b9.
Bug: 19635137
Change-Id: I1f53a432936dd3d51459e7d8cd86421bde399150
2015-03-09 08:39:46 -07:00
Geoff Mendal
e88afe3ee7
am 146990b7: (-s ours) Import translations. DO NOT MERGE
...
* commit '146990b7494c3fe6f47f6e8425ecb13f75007418':
Import translations. DO NOT MERGE
2015-03-09 15:35:56 +00:00
Bryce Lee
1b8df04b8d
am 8aeab6c8: Allow the keyguard service to be configurable.
...
* commit '8aeab6c8b9b89d77108fc05245561e33113fe27f':
Allow the keyguard service to be configurable.
2015-03-09 15:35:38 +00:00
Bryce Lee
168d0ade0c
am 1e53b98c: Merge "Allow press and hold from non-interactive." into lmp-mr1-modular-dev
...
* commit '1e53b98c38b6606859f4b33a98d776cbb65f1a42':
Allow press and hold from non-interactive.
2015-03-09 15:35:05 +00:00
Luan Nguyen
ea9308cf6b
am a9639fe6: am 2fcc438f: am 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs
...
* commit 'a9639fe619591888fcc97475de15a55017dd1ff7':
docs: Add new partners to Wear index page
2015-03-09 15:05:44 +00:00
Luan Nguyen
a9639fe619
am 2fcc438f: am 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs
...
* commit '2fcc438f765789e1786cdfe612f61b034ad7344b':
docs: Add new partners to Wear index page
2015-03-09 14:59:12 +00:00
Nicolas Prevot
6dc6876eed
Merge "Add a new extra to specify the admin component for provisioning."
2015-03-09 14:53:24 +00:00
Luan Nguyen
2fcc438f76
am 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs
...
* commit '6a96a77814a89836ba0a85335479c6b3ea9aec33':
docs: Add new partners to Wear index page
2015-03-09 14:52:45 +00:00
Nicolas Prevot
1844025738
Add a new extra to specify the admin component for provisioning.
...
An app may have several device admins.
For this case, allow the caller to specify which one will become
an active device admin, and the profile owner (in the profile owner flow).
BUG:19348295
Change-Id: Ia5f995eed6c7f8933eb00d3250daa703ba6ee616
2015-03-09 14:48:04 +00:00
Luan Nguyen
6a96a77814
Merge "docs: Add new partners to Wear index page" into lmp-docs
2015-03-09 14:47:33 +00:00
Geoff Mendal
ee34679510
Merge "Import translations. DO NOT MERGE"
2015-03-09 14:41:18 +00:00
Geoff Mendal
7dd69f551f
Import translations. DO NOT MERGE
...
Change-Id: I9b6fac7639695f15cc7d1aa5b814bd6fa0872165
Auto-generated-cl: translation import
2015-03-09 07:39:13 -07:00
Geoff Mendal
8951e572de
Merge "Import translations. DO NOT MERGE"
2015-03-09 13:55:21 +00:00
Geoff Mendal
cfad35db63
Import translations. DO NOT MERGE
...
Change-Id: I433509f59a78920d4e2ac1e5eb4d44fb81b2fd48
Auto-generated-cl: translation import
2015-03-09 06:40:26 -07:00
Geoff Mendal
cb93de1b7d
Import translations. DO NOT MERGE
...
Change-Id: Id2e79810aa3f2c1beb932786f579feab06b6825a
Auto-generated-cl: translation import
2015-03-09 06:23:28 -07:00
Geoff Mendal
d7852b66ab
Import translations. DO NOT MERGE
...
Change-Id: I5057e9ae3a255e9315967eae49f71c862fd53290
Auto-generated-cl: translation import
2015-03-09 05:56:54 -07:00
Geoff Mendal
146990b749
Import translations. DO NOT MERGE
...
Change-Id: I9679db5505c907b78d3d97585d061f6746b0af7f
Auto-generated-cl: translation import
2015-03-09 05:34:56 -07:00
Benjamin Franz
f3ece36535
Block setting wallpapers from managed profiles.
...
Silently fail when a managed profile app tries to change the
wallpaper and return default values for getters in that case.
This is implemented through a new AppOp that is controlled by
a new user restriction that will be set during provisioning.
Bug: 18725052
Change-Id: I1601852617e738be86560f054daf3435dd9f5a9f
2015-03-09 10:39:21 +00:00
Tor Norbye
b3ec733bb8
Annotate methods with size and range annotations
...
Change-Id: I666861f0dfae31402b1280e9a966a583b88e2e1a
2015-03-07 20:49:19 -08:00
Tor Norbye
1c2bf03d10
Annotate return values with @CheckReturn
...
Change-Id: Icd8fb6adb591ccd7f35f2336ae716b198abf69c5
2015-03-07 20:49:18 -08:00
Tor Norbye
c615c6fc9c
Annotate methods to be called from overrides with @CallSuper
...
Change-Id: Ibc587c2aaee9f3e7f448079f72a75459fe4e15e7
2015-03-07 20:49:18 -08:00
Andreas Gampe
3aa2d01752
am 3f74f638: am 55966006: am 7a4cb563: Merge "Frameworks/base: Remove unnecessary Pattern instance"
...
* commit '3f74f6386a15d09f27dbc81edd8dd2c13e298d73':
Frameworks/base: Remove unnecessary Pattern instance
2015-03-08 00:17:54 +00:00
Andreas Gampe
967567541a
am 208e80d9: am a3d5b230: am cdc19f3f: Merge "Frameworks/base: Remove unnecessary Pattern instance"
...
* commit '208e80d931fd775de925529e0c36a34e9b7f916a':
Frameworks/base: Remove unnecessary Pattern instance
2015-03-08 00:17:47 +00:00
Mathieu Chartier
5e3c29956b
am ea3d53f5: am 773bcfa7: am e59b7ce2: Merge "Add JIT system properties"
...
* commit 'ea3d53f5a8f8e396bf8918041087db4603d444e5':
Add JIT system properties
2015-03-08 00:17:40 +00:00
Miao Wang
de770528ec
am 989e03f1: am c1e2bf95: am 4b5af9bc: Merge "[RenderScript] Update the java API about Allocation copyTo & From FieldPacker"
...
* commit '989e03f144e8031f33af08945e845283dddcc8ad':
[RenderScript] Update the java API about Allocation copyTo & From FieldPacker
2015-03-08 00:17:34 +00:00
Miao Wang
b5c8004d6f
am 449571c4: am 26f1a538: am 8b86ee9f: Merge "[RenderScript] Add missing variable"
...
* commit '449571c45e47e9b8d118c59dbd909b0d512f7e6d':
[RenderScript] Add missing variable
2015-03-08 00:17:27 +00:00
Miao Wang
12d8a860b8
am ec89c1ea: am a61832c8: am 288e6f67: Merge "[RenderScript] AutoPadding & Unpadding for Vec3 Elements during copyTo & copyFrom."
...
* commit 'ec89c1ea731256cd0d71ee58733b2855e1e6e4fa':
[RenderScript] AutoPadding & Unpadding for Vec3 Elements during copyTo & copyFrom.
2015-03-08 00:17:18 +00:00
Andreas Gampe
3f74f6386a
am 55966006: am 7a4cb563: Merge "Frameworks/base: Remove unnecessary Pattern instance"
...
* commit '5596600697f54feb944737b7bc55df06123e6e54':
Frameworks/base: Remove unnecessary Pattern instance
2015-03-08 00:08:25 +00:00
Andreas Gampe
208e80d931
am a3d5b230: am cdc19f3f: Merge "Frameworks/base: Remove unnecessary Pattern instance"
...
* commit 'a3d5b2304cf2db03ba728d37c87ef7360c7da44f':
Frameworks/base: Remove unnecessary Pattern instance
2015-03-08 00:08:19 +00:00
Mathieu Chartier
ea3d53f5a8
am 773bcfa7: am e59b7ce2: Merge "Add JIT system properties"
...
* commit '773bcfa7ecb1e06831e7f060ecc3c43d0cf1bf00':
Add JIT system properties
2015-03-08 00:07:18 +00:00
Miao Wang
989e03f144
am c1e2bf95: am 4b5af9bc: Merge "[RenderScript] Update the java API about Allocation copyTo & From FieldPacker"
...
* commit 'c1e2bf95ab77127ea21ebd44b8615eca85338af1':
[RenderScript] Update the java API about Allocation copyTo & From FieldPacker
2015-03-08 00:07:09 +00:00
Miao Wang
449571c45e
am 26f1a538: am 8b86ee9f: Merge "[RenderScript] Add missing variable"
...
* commit '26f1a53838b2c8b77c0995801dcc1c7816c47f16':
[RenderScript] Add missing variable
2015-03-08 00:07:01 +00:00
Miao Wang
ec89c1ea73
am a61832c8: am 288e6f67: Merge "[RenderScript] AutoPadding & Unpadding for Vec3 Elements during copyTo & copyFrom."
...
* commit 'a61832c8fdff8cf086113f578032136c81935904':
[RenderScript] AutoPadding & Unpadding for Vec3 Elements during copyTo & copyFrom.
2015-03-08 00:06:55 +00:00
Mike Lockwood
d73ff8727d
Merge changes Ib5cc22db,I93e0c449,I65cd4cfd,I1cef3bd4,I628c0468
...
* changes:
MIDI Manager: Add explicit close mechanism for input and output ports
MidiDeviceService: Add getDeviceInfo() accessor method
Add MidiDevice.close() method so we can clean up our ServiceConnection
Make MidiSender and MidiReceiver abstract classes, rename MidiReceiver.post() to receive()
Eliminate MidiPort base class for MidiInputPort and MidiOutputPort
2015-03-07 23:50:37 +00:00
Elliott Hughes
4c5806b6b4
Use the icu:: namespace for icu4c API.
...
The icu guys recommend working this way, though it's not the default.
Internally Google makes this the default, and I've switched libcore
over.
Bug: 15350832
Change-Id: I038e12bea58dd089a46d0e681b5ab76cfc19d7b9
2015-03-07 11:00:50 -08:00
Andreas Gampe
5596600697
am 7a4cb563: Merge "Frameworks/base: Remove unnecessary Pattern instance"
...
* commit '7a4cb563a29f05658760739d3bc2e70bd6342174':
Frameworks/base: Remove unnecessary Pattern instance
2015-03-07 17:13:16 +00:00
Andreas Gampe
a3d5b2304c
am cdc19f3f: Merge "Frameworks/base: Remove unnecessary Pattern instance"
...
* commit 'cdc19f3f8a20b975e8e70f4b4cce5ce2be811726':
Frameworks/base: Remove unnecessary Pattern instance
2015-03-07 17:13:09 +00:00
Scott Kennedy
6c4c58d6d9
Merge "Add more @Nullable annotations"
2015-03-07 01:34:49 +00:00
Scott Kennedy
ed2b5f8aca
Add more @Nullable annotations
...
Change-Id: I5b2935eb5e63289d80ebf9bf70741800b1c0934a
2015-03-06 17:24:58 -08:00
Chih-Hung Hsieh
7830c81cd2
Merge "Fix unused local variale warning from clang/llvm."
2015-03-07 01:13:50 +00:00
Chih-Hung Hsieh
9ad6ac08a9
Fix unused local variale warning from clang/llvm.
...
Change-Id: Ib9b5d06313e5bf933edfb38a4522929104c7917a
2015-03-06 17:07:57 -08:00
Andreas Gampe
7a4cb563a2
Merge "Frameworks/base: Remove unnecessary Pattern instance"
2015-03-07 01:03:14 +00:00
Dianne Hackborn
0e24f143ed
Merge "Add new debug feature to automatically create heap dumps."
2015-03-07 00:44:57 +00:00
Dianne Hackborn
b9a5e4ad30
Add new debug feature to automatically create heap dumps.
...
Not yet working, unless you turn off SELinux enforcing.
We need to update SElinux to allow the system process
to give apps access to /data/system/heapdump/javaheap.bin.
Currently watching can only be enabled through the shell,
such as:
adb shell am set-watch-heap com.android.systemui 1024
The last number is the process pss size in bytes, so this is
asking us to warn if it goes about 1K which will be all the
time.
Change-Id: I2089e5db2927afca0bf01a363c6247ee5dcb26e8
2015-03-06 16:42:03 -08:00
Andreas Gampe
055678b5fe
Frameworks/base: Remove unnecessary Pattern instance
...
Using a static Pattern in UriMatcher prevents compile-time
initialization.
It is also not efficient, as String.split has a fast path for simple
splits.
Bug: 19542228
Change-Id: Ie9e5bfe6da04c6d05ec10b1426d0cd136ef46ef2
2015-03-07 00:19:01 +00:00
Andreas Gampe
cdc19f3f8a
Merge "Frameworks/base: Remove unnecessary Pattern instance"
2015-03-07 00:18:45 +00:00
Andreas Gampe
18e99c1288
Frameworks/base: Remove unnecessary Pattern instance
...
Using a static Pattern in ActivityThread prevents compile-time
initialization of ActivityThread and GestureDetector, which depends
on the former.
It is also not efficient, as String.split has a fast path for simple
splits.
Bug: 19542228
Change-Id: I5bb843c08c81e0d259bb8afafa87a8467bb1730e
2015-03-07 00:18:15 +00:00
Rich Slogar
d5322338d8
docs: android plugin for gradle release 1.1.3 release notes
...
Change-Id: If7ee333e83e0be60c864021e068f024694eb3dd1
2015-03-06 16:17:56 -08:00