OSDN Git Service
Olawale Ogunwale [Mon, 9 Mar 2015 16:43:16 +0000 (16:43 +0000)]
am
edc3c893: am
14ccc26f: Merge "[ActivityManager] Skip receiver precisely."
* commit '
edc3c8939f3cde4ab9343e7654f5dac1122fb470':
[ActivityManager] Skip receiver precisely.
Olawale Ogunwale [Mon, 9 Mar 2015 16:36:31 +0000 (16:36 +0000)]
am
14ccc26f: Merge "[ActivityManager] Skip receiver precisely."
* commit '
14ccc26f1ce006963f1a0b7a917404aa6a0e9da1':
[ActivityManager] Skip receiver precisely.
Olawale Ogunwale [Mon, 9 Mar 2015 16:30:52 +0000 (16:30 +0000)]
Merge "[ActivityManager] Skip receiver precisely."
Geoff Mendal [Mon, 9 Mar 2015 15:35:56 +0000 (15:35 +0000)]
am
146990b7: (-s ours) Import translations. DO NOT MERGE
* commit '
146990b7494c3fe6f47f6e8425ecb13f75007418':
Import translations. DO NOT MERGE
Bryce Lee [Mon, 9 Mar 2015 15:35:38 +0000 (15:35 +0000)]
am
8aeab6c8: Allow the keyguard service to be configurable.
* commit '
8aeab6c8b9b89d77108fc05245561e33113fe27f':
Allow the keyguard service to be configurable.
Bryce Lee [Mon, 9 Mar 2015 15:35:05 +0000 (15:35 +0000)]
am
1e53b98c: Merge "Allow press and hold from non-interactive." into lmp-mr1-modular-dev
* commit '
1e53b98c38b6606859f4b33a98d776cbb65f1a42':
Allow press and hold from non-interactive.
Geoff Mendal [Mon, 9 Mar 2015 12:34:56 +0000 (05:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9679db5505c907b78d3d97585d061f6746b0af7f
Auto-generated-cl: translation import
Andreas Gampe [Sun, 8 Mar 2015 00:08:25 +0000 (00:08 +0000)]
am
55966006: am
7a4cb563: Merge "Frameworks/base: Remove unnecessary Pattern instance"
* commit '
5596600697f54feb944737b7bc55df06123e6e54':
Frameworks/base: Remove unnecessary Pattern instance
Andreas Gampe [Sun, 8 Mar 2015 00:08:19 +0000 (00:08 +0000)]
am
a3d5b230: am
cdc19f3f: Merge "Frameworks/base: Remove unnecessary Pattern instance"
* commit '
a3d5b2304cf2db03ba728d37c87ef7360c7da44f':
Frameworks/base: Remove unnecessary Pattern instance
Mathieu Chartier [Sun, 8 Mar 2015 00:07:18 +0000 (00:07 +0000)]
am
773bcfa7: am
e59b7ce2: Merge "Add JIT system properties"
* commit '
773bcfa7ecb1e06831e7f060ecc3c43d0cf1bf00':
Add JIT system properties
Miao Wang [Sun, 8 Mar 2015 00:07:09 +0000 (00:07 +0000)]
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
Miao Wang [Sun, 8 Mar 2015 00:07:01 +0000 (00:07 +0000)]
am
26f1a538: am
8b86ee9f: Merge "[RenderScript] Add missing variable"
* commit '
26f1a53838b2c8b77c0995801dcc1c7816c47f16':
[RenderScript] Add missing variable
Miao Wang [Sun, 8 Mar 2015 00:06:55 +0000 (00:06 +0000)]
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.
Andreas Gampe [Sat, 7 Mar 2015 17:13:16 +0000 (17:13 +0000)]
am
7a4cb563: Merge "Frameworks/base: Remove unnecessary Pattern instance"
* commit '
7a4cb563a29f05658760739d3bc2e70bd6342174':
Frameworks/base: Remove unnecessary Pattern instance
Andreas Gampe [Sat, 7 Mar 2015 17:13:09 +0000 (17:13 +0000)]
am
cdc19f3f: Merge "Frameworks/base: Remove unnecessary Pattern instance"
* commit '
cdc19f3f8a20b975e8e70f4b4cce5ce2be811726':
Frameworks/base: Remove unnecessary Pattern instance
Andreas Gampe [Sat, 7 Mar 2015 01:03:13 +0000 (01:03 +0000)]
Merge "Frameworks/base: Remove unnecessary Pattern instance"
Andreas Gampe [Fri, 6 Mar 2015 23:53:06 +0000 (15:53 -0800)]
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
Andreas Gampe [Sat, 7 Mar 2015 00:18:44 +0000 (00:18 +0000)]
Merge "Frameworks/base: Remove unnecessary Pattern instance"
Andreas Gampe [Fri, 6 Mar 2015 23:29:06 +0000 (15:29 -0800)]
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
Bryce Lee [Fri, 6 Mar 2015 23:21:46 +0000 (15:21 -0800)]
Allow the keyguard service to be configurable.
Change-Id: I811171c228764c3e0e507ad3ce28835ccad9bb31
Bryce Lee [Fri, 6 Mar 2015 20:41:12 +0000 (20:41 +0000)]
Merge "Allow press and hold from non-interactive." into lmp-mr1-modular-dev
Mathieu Chartier [Fri, 6 Mar 2015 01:36:55 +0000 (01:36 +0000)]
am
e59b7ce2: Merge "Add JIT system properties"
* commit '
e59b7ce2564a916240e561b36f4476f2d72a65c5':
Add JIT system properties
Mathieu Chartier [Fri, 6 Mar 2015 01:31:27 +0000 (01:31 +0000)]
Merge "Add JIT system properties"
Miao Wang [Fri, 6 Mar 2015 01:10:38 +0000 (01:10 +0000)]
am
4b5af9bc: Merge "[RenderScript] Update the java API about Allocation copyTo & From FieldPacker"
* commit '
4b5af9bce10dbb8b6d5ff27a5f0c49f3498a6245':
[RenderScript] Update the java API about Allocation copyTo & From FieldPacker
Miao Wang [Fri, 6 Mar 2015 01:05:28 +0000 (01:05 +0000)]
Merge "[RenderScript] Update the java API about Allocation copyTo & From FieldPacker"
Mathieu Chartier [Fri, 6 Mar 2015 01:00:41 +0000 (17:00 -0800)]
Add JIT system properties
Added the following runtime options.
"dalvik.vm.usejit" -> "-Xusejit:"
"dalvik.vm.jitcodecachesize" -> "-Xjitcodecachesize:"
"dalvik.vm.jitthreshold" -> "-Xjitthreshold:"
Bug:
17950037
Change-Id: I4996cdd1e34a1743d83c37069f545e6e09bccdb9
Miao Wang [Fri, 6 Mar 2015 01:02:23 +0000 (01:02 +0000)]
am
8b86ee9f: Merge "[RenderScript] Add missing variable"
* commit '
8b86ee9fb5909a95a46907aede4d1b22b4ef3bba':
[RenderScript] Add missing variable
Miao Wang [Fri, 6 Mar 2015 01:01:58 +0000 (01:01 +0000)]
am
288e6f67: Merge "[RenderScript] AutoPadding & Unpadding for Vec3 Elements during copyTo & copyFrom."
* commit '
288e6f67181ce74ec4b97b61def1b9510b1221d0':
[RenderScript] AutoPadding & Unpadding for Vec3 Elements during copyTo & copyFrom.
Miao Wang [Thu, 5 Mar 2015 00:40:21 +0000 (16:40 -0800)]
[RenderScript] Update the java API about Allocation copyTo & From FieldPacker
Change-Id: I4e1b911d4cdfec8a841bc5a8bc615c64c50e8fc8
Miao Wang [Fri, 6 Mar 2015 00:34:51 +0000 (00:34 +0000)]
Merge "[RenderScript] Add missing variable"
Dan Sandler [Fri, 6 Mar 2015 00:31:04 +0000 (00:31 +0000)]
am
8deb6d95: am
e6a4b445: am
3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev
* commit '
8deb6d95a73d5d6860fbfb2eb273cdbc49c5d2c9':
Avoid crashing on startup when policy forbids lockscreen camera.
Miao Wang [Fri, 6 Mar 2015 00:27:15 +0000 (16:27 -0800)]
[RenderScript] Add missing variable
Change-Id: I148bab3a8c3fb360d345549401d0ed579a37e971
Dan Sandler [Fri, 6 Mar 2015 00:21:47 +0000 (00:21 +0000)]
am
e6a4b445: am
3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev
* commit '
e6a4b445944489d67d40c8f52322fb149290fcf8':
Avoid crashing on startup when policy forbids lockscreen camera.
Dan Sandler [Fri, 6 Mar 2015 00:10:22 +0000 (00:10 +0000)]
am
3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev
* commit '
3581f4c91a77ecb9313f51a2d07ed88ff61d9299':
Avoid crashing on startup when policy forbids lockscreen camera.
Dan Sandler [Fri, 6 Mar 2015 00:03:34 +0000 (00:03 +0000)]
Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev
Dan Albert [Thu, 5 Mar 2015 23:50:35 +0000 (23:50 +0000)]
am
f8d6a4ba: resolved conflicts for merge of
701f9c2f to stage-aosp-master
* commit '
f8d6a4ba8739e16e13ae0014efa099ec564939a7':
Stop using namespace std.
Miao Wang [Thu, 5 Mar 2015 23:49:57 +0000 (23:49 +0000)]
Merge "[RenderScript] AutoPadding & Unpadding for Vec3 Elements during copyTo & copyFrom."
Dan Albert [Thu, 5 Mar 2015 23:41:39 +0000 (15:41 -0800)]
resolved conflicts for merge of
701f9c2f to stage-aosp-master
Change-Id: I42e0411c0acef4b15137491ecaaed95d9b1cd0c1
Eric Gilmore [Thu, 5 Mar 2015 23:38:31 +0000 (23:38 +0000)]
am
6e3c763f: am
685e6ce8: am
636a39ba: am
e95fa264: am
e17b0a14: am
87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs
* commit '
6e3c763f0146377f610227c879c8037b1842ab6e':
Re-fixing link, and removing trailing white space.
Dan Albert [Thu, 5 Mar 2015 23:31:41 +0000 (23:31 +0000)]
Merge "Stop using namespace std."
Eric Gilmore [Thu, 5 Mar 2015 23:26:17 +0000 (23:26 +0000)]
am
685e6ce8: am
636a39ba: am
e95fa264: am
e17b0a14: am
87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs
* commit '
685e6ce830f97383846335eec758e83ba3ad7060':
Re-fixing link, and removing trailing white space.
Eric Gilmore [Thu, 5 Mar 2015 23:11:09 +0000 (23:11 +0000)]
am
636a39ba: am
e95fa264: am
e17b0a14: am
87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs
* commit '
636a39babbda97743b33511b3dd2addafc8c2847':
Re-fixing link, and removing trailing white space.
Eric Gilmore [Thu, 5 Mar 2015 23:04:27 +0000 (23:04 +0000)]
am
e95fa264: am
e17b0a14: am
87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs
* commit '
e95fa2649b62a3fbccd096b43925a17c6ff03228':
Re-fixing link, and removing trailing white space.
Eric Gilmore [Thu, 5 Mar 2015 22:50:16 +0000 (22:50 +0000)]
am
e17b0a14: am
87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs
* commit '
e17b0a14ccc427bff386517537fcf23e00a087d4':
Re-fixing link, and removing trailing white space.
Andreas Gampe [Thu, 5 Mar 2015 22:46:49 +0000 (22:46 +0000)]
am
ecc20aaf: am
63ab6eb2: Merge "Frameworks/base: Use ArraySet more explicitly"
* commit '
ecc20aafa6f3d272292e7b3577c99f2c127e590f':
Frameworks/base: Use ArraySet more explicitly
Andreas Gampe [Thu, 5 Mar 2015 22:38:56 +0000 (22:38 +0000)]
am
63ab6eb2: Merge "Frameworks/base: Use ArraySet more explicitly"
* commit '
63ab6eb220a2a75837d6e3d18d19cbd5dda175eb':
Frameworks/base: Use ArraySet more explicitly
Eric Gilmore [Thu, 5 Mar 2015 22:34:58 +0000 (22:34 +0000)]
am
87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs
* commit '
87499b275bc7a8d4a12a3134646769a5c6c34829':
Re-fixing link, and removing trailing white space.
Andreas Gampe [Thu, 5 Mar 2015 22:29:56 +0000 (22:29 +0000)]
Merge "Frameworks/base: Use ArraySet more explicitly"
Eric Gilmore [Thu, 5 Mar 2015 22:00:20 +0000 (22:00 +0000)]
Merge "Re-fixing link, and removing trailing white space." into lmp-docs
Eric Gilmore [Thu, 5 Mar 2015 21:39:21 +0000 (13:39 -0800)]
Re-fixing link, and removing trailing white space.
Change-Id: Ic6cef9862424d5581cf0ad5b8366c7033a9fdd93
Andreas Gampe [Thu, 5 Mar 2015 21:13:55 +0000 (13:13 -0800)]
Frameworks/base: Use ArraySet more explicitly
In KeySetManagerService, use ArraySet more explicitly. Avoid for-each
loops.
Collections API methods on ArraySet are not very efficient. Iterators
incur two object allocations: a helper and the actual iterator object.
During boot, about 4.5K such calls are made. Using the ArraySet more
explicitly like an ArrayList/array avoids the overhead.
Bug:
19617481
Change-Id: I25df334fa1d4be3210667fb1404e3c43f2585049
Rich Slogar [Thu, 5 Mar 2015 20:05:31 +0000 (20:05 +0000)]
am
2847fc99: am
cfb0978f: am
bc669e3f: am
dad1cbeb: am
9f485e97: am
4aba69a8: docs: sdk tools date fix
* commit '
2847fc9912715027492bdae8567cd896b7ba8f9f':
docs: sdk tools date fix
Rich Slogar [Thu, 5 Mar 2015 19:59:55 +0000 (19:59 +0000)]
am
cfb0978f: am
bc669e3f: am
dad1cbeb: am
9f485e97: am
4aba69a8: docs: sdk tools date fix
* commit '
cfb0978fd9a6bf8fa06dee061df03fccf20fabc4':
docs: sdk tools date fix
Rich Slogar [Thu, 5 Mar 2015 19:52:05 +0000 (19:52 +0000)]
am
bc669e3f: am
dad1cbeb: am
9f485e97: am
4aba69a8: docs: sdk tools date fix
* commit '
bc669e3f555519f641102b759a04a01ac5c10cad':
docs: sdk tools date fix
Rich Slogar [Thu, 5 Mar 2015 19:46:12 +0000 (19:46 +0000)]
am
dad1cbeb: am
9f485e97: am
4aba69a8: docs: sdk tools date fix
* commit '
dad1cbebfabf421efc90d366d9c4fd67becf930f':
docs: sdk tools date fix
Rich Slogar [Thu, 5 Mar 2015 19:39:47 +0000 (19:39 +0000)]
am
9f485e97: am
4aba69a8: docs: sdk tools date fix
* commit '
9f485e971e06dad399dd70712787f4c30da9515e':
docs: sdk tools date fix
Rich Slogar [Thu, 5 Mar 2015 19:33:56 +0000 (19:33 +0000)]
am
4aba69a8: docs: sdk tools date fix
* commit '
4aba69a8a7f58541ce76429252dd0c9650b40f35':
docs: sdk tools date fix
Rich Slogar [Thu, 5 Mar 2015 19:24:45 +0000 (11:24 -0800)]
docs: sdk tools date fix
Change-Id: Ieb0a5193a5bbf7efd1e5852be4b0db421d08db14
Andreas Gampe [Thu, 5 Mar 2015 17:33:13 +0000 (17:33 +0000)]
am
9c0ba24f: am
6695b992: Merge "Frameworks/base: Add removeAll for ArraySet"
* commit '
9c0ba24f3b54fa7916626f3d76ec6818d78ca47e':
Frameworks/base: Add removeAll for ArraySet
Andreas Gampe [Thu, 5 Mar 2015 17:15:58 +0000 (17:15 +0000)]
am
6695b992: Merge "Frameworks/base: Add removeAll for ArraySet"
* commit '
6695b9920d15f8d9a17d6b0c66b863d1c2e38584':
Frameworks/base: Add removeAll for ArraySet
Andreas Gampe [Thu, 5 Mar 2015 17:10:30 +0000 (17:10 +0000)]
Merge "Frameworks/base: Add removeAll for ArraySet"
smain@google.com [Thu, 5 Mar 2015 06:32:35 +0000 (06:32 +0000)]
am
b488a256: am
4f674bbd: am
8b2be54a: am
182059f8: am
ca10a435: am
f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
* commit '
b488a256308c8c7598da19d109be99d19a08a76d':
add tags for wakelock and other API names
Brian Carlstrom [Thu, 5 Mar 2015 06:27:40 +0000 (06:27 +0000)]
am
686a1b2f: am
165c2564: Merge "Manually add SignalStrength to preloaded-classes"
* commit '
686a1b2f4ac90c3fb522405258212c8a91ed5148':
Manually add SignalStrength to preloaded-classes
smain@google.com [Thu, 5 Mar 2015 06:25:43 +0000 (06:25 +0000)]
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
Brian Carlstrom [Thu, 5 Mar 2015 06:22:18 +0000 (06:22 +0000)]
am
165c2564: Merge "Manually add SignalStrength to preloaded-classes"
* commit '
165c25641ccedf6447d09dfec00f485df1361c35':
Manually add SignalStrength to preloaded-classes
smain@google.com [Thu, 5 Mar 2015 06:18:45 +0000 (06:18 +0000)]
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
Brian Carlstrom [Thu, 5 Mar 2015 06:15:53 +0000 (06:15 +0000)]
Merge "Manually add SignalStrength to preloaded-classes"
smain@google.com [Thu, 5 Mar 2015 06:10:54 +0000 (06:10 +0000)]
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
Brian Carlstrom [Thu, 5 Mar 2015 05:56:26 +0000 (21:56 -0800)]
Manually add SignalStrength to preloaded-classes
Bug:
19323020
Change-Id: I61e9d2dd5d06fe2353da17e5646f259122e5ea98
Anthony Hugh [Thu, 5 Mar 2015 04:08:32 +0000 (04:08 +0000)]
am
097f8d5f: Merge "Update "Optimizing app X from Y string"" into lmp-mr1-modular-dev
* commit '
097f8d5f6b82f27e71ec72795dee053dfc698ac5':
Update "Optimizing app X from Y string"
Anthony Hugh [Thu, 5 Mar 2015 04:04:04 +0000 (04:04 +0000)]
Merge "Update "Optimizing app X from Y string"" into lmp-mr1-modular-dev
Andreas Gampe [Thu, 5 Mar 2015 01:14:10 +0000 (17:14 -0800)]
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
smain@google.com [Thu, 5 Mar 2015 01:12:15 +0000 (01:12 +0000)]
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
Eric Gilmore [Thu, 5 Mar 2015 01:10:56 +0000 (01:10 +0000)]
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.
Eric Gilmore [Thu, 5 Mar 2015 01:02:55 +0000 (01:02 +0000)]
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.
smain@google.com [Thu, 5 Mar 2015 00:59:24 +0000 (00:59 +0000)]
am
f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
* commit '
f4bbec09a4c3795bc72d6a95aab3488c6c49ce6e':
add tags for wakelock and other API names
Bart Sears [Thu, 5 Mar 2015 00:59:01 +0000 (00:59 +0000)]
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
Eric Gilmore [Thu, 5 Mar 2015 00:55:38 +0000 (00:55 +0000)]
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.
Bart Sears [Thu, 5 Mar 2015 00:52:58 +0000 (00:52 +0000)]
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
smain@google.com [Thu, 5 Mar 2015 00:49:48 +0000 (00:49 +0000)]
Merge "add tags for wakelock and other API names" into lmp-docs
Eric Gilmore [Thu, 5 Mar 2015 00:49:21 +0000 (00:49 +0000)]
am
62777b18: am
5c30adfd: am
22d1c1ce: Merge "Fixing broken link per b/
19503824." into lmp-docs
* commit '
62777b189dc31c250c4ae06915aae0a337950e1c':
Fixing broken link per b/
19503824.
Bart Sears [Thu, 5 Mar 2015 00:40:13 +0000 (00:40 +0000)]
am
4eedcceb: Merge "Merge commit \'
83a63bac\' into manualmerge" into lmp-mr1-dev
* commit '
4eedccebb7f4c3f9e2f1890f92bead4b9c2a9819':
Do not make ActivityContainer available to apps. DO NOT MERGE
Bart Sears [Thu, 5 Mar 2015 00:35:07 +0000 (00:35 +0000)]
Merge "Merge commit '
83a63bac' into manualmerge" into lmp-mr1-dev
Tucker Sylvestro [Thu, 5 Mar 2015 00:27:13 +0000 (00:27 +0000)]
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)
Tucker Sylvestro [Thu, 5 Mar 2015 00:15:06 +0000 (00:15 +0000)]
Merge "DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (3/4)" into lmp-mr1-modular-dev
Anthony Hugh [Wed, 4 Mar 2015 00:50:05 +0000 (16:50 -0800)]
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
Miao Wang [Mon, 2 Mar 2015 23:15:15 +0000 (15:15 -0800)]
[RenderScript] AutoPadding & Unpadding for Vec3 Elements during
copyTo & copyFrom.
Change-Id: I10b6fb235717e181ebb30b92e4dbe23e6183a29c
John Spurlock [Wed, 4 Mar 2015 23:15:51 +0000 (23:15 +0000)]
am
bd438742: am
b879e739: am
c974ac11: MediaProjectionPermissionActivity: Fix NPE.
* commit '
bd438742870a51eacea3554376f671bd1be0e30c':
MediaProjectionPermissionActivity: Fix NPE.
John Spurlock [Wed, 4 Mar 2015 23:09:19 +0000 (23:09 +0000)]
am
b879e739: am
c974ac11: MediaProjectionPermissionActivity: Fix NPE.
* commit '
b879e7395fa9446952b840b1d576ff225b039774':
MediaProjectionPermissionActivity: Fix NPE.
John Spurlock [Wed, 4 Mar 2015 23:01:26 +0000 (23:01 +0000)]
am
c974ac11: MediaProjectionPermissionActivity: Fix NPE.
* commit '
c974ac11f808968648d26e83a0b64a7fba02ad15':
MediaProjectionPermissionActivity: Fix NPE.
Andre Eisenbach [Fri, 5 Dec 2014 17:31:30 +0000 (09:31 -0800)]
DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (3/4)
Bug:
18508263
Change-Id: I88f9c90dab8b0c825010c8617709449a3dd704b2
Dan Albert [Wed, 4 Mar 2015 21:54:20 +0000 (13:54 -0800)]
Stop using namespace std.
The pattern of #include and using namespace std here fails to build
with GCC. At first glance it's a GCC bug rather than libc++ doing
something wrong. Regardless, it can be worked around by just
specifying std:: where appropriate.
Bug:
19606303
Change-Id: I5652682eae7ca7559cf2a9307909859013440781
John Spurlock [Tue, 24 Feb 2015 17:14:06 +0000 (12:14 -0500)]
MediaProjectionPermissionActivity: Fix NPE.
Avoid dismissing a null dialog.
Bug:
19492919
Change-Id: I6642bb5194d9818ff3db1266c7c78ed752e23ecf
(cherry picked from commit
3d332f4e67a484abe597576bf329d89655afe720)
Craig Mautner [Wed, 4 Mar 2015 18:10:34 +0000 (10:10 -0800)]
Merge commit '
83a63bac' into manualmerge
Eric Gilmore [Wed, 4 Mar 2015 17:53:31 +0000 (17:53 +0000)]
am
5c30adfd: am
22d1c1ce: Merge "Fixing broken link per b/
19503824." into lmp-docs
* commit '
5c30adfdb6ef4b004ef0b88006660598f40eb6f5':
Fixing broken link per b/
19503824.
Eric Gilmore [Wed, 4 Mar 2015 17:47:01 +0000 (17:47 +0000)]
am
22d1c1ce: Merge "Fixing broken link per b/
19503824." into lmp-docs
* commit '
22d1c1ce1dc3c84d7517ba64a5d07b5946e49514':
Fixing broken link per b/
19503824.
Eric Gilmore [Wed, 4 Mar 2015 17:40:15 +0000 (17:40 +0000)]
Merge "Fixing broken link per b/
19503824." into lmp-docs
Craig Mautner [Wed, 4 Mar 2015 16:15:35 +0000 (16:15 +0000)]
am
8fa394fa: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-dev
* commit '
8fa394fa8c4eb3ca832dac36baf5645a40d449f1':
Do not make ActivityContainer available to apps. DO NOT MERGE
Craig Mautner [Wed, 4 Mar 2015 16:09:28 +0000 (16:09 +0000)]
Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-dev
Geoff Mendal [Wed, 4 Mar 2015 14:14:29 +0000 (14:14 +0000)]
am
b214417a: (-s ours) am
3b9e64f3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
b214417a6e1a7cca5bac961c2b32b72d8baea2dd':
Import translations. DO NOT MERGE
OSDN Git Service
