OSDN Git Service
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.
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.
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.
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
Geoff Mendal [Wed, 4 Mar 2015 14:14:24 +0000 (14:14 +0000)]
am
bb9360e3: (-s ours) am
63069cc9: (-s ours) Import translations. DO NOT MERGE
* commit '
bb9360e36cea7c2af17992c1b08eedbce707962b':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 14:08:11 +0000 (14:08 +0000)]
am
3b9e64f3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
3b9e64f3265ad146da1b9f5b523c406acd041f59':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 14:08:03 +0000 (14:08 +0000)]
am
63069cc9: (-s ours) Import translations. DO NOT MERGE
* commit '
63069cc985869fe06254e352ea63b361cb0d0917':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 14:04:03 +0000 (14:04 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Wed, 4 Mar 2015 14:02:36 +0000 (06:02 -0800)]
Import translations. DO NOT MERGE
Change-Id: I50787822a2df02ff61bfe4f7402b96dcd2cd43a7
Auto-generated-cl: translation import
Geoff Mendal [Wed, 4 Mar 2015 13:56:33 +0000 (05:56 -0800)]
Import translations. DO NOT MERGE
Change-Id: If2c19af2e0b45fec9a0486eedbe51d7fe8bdf426
Auto-generated-cl: translation import
Geoff Mendal [Wed, 4 Mar 2015 13:47:51 +0000 (13:47 +0000)]
am
80b9bd85: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
80b9bd854365bf052db9572bcff0fedf74090ff5':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 13:47:46 +0000 (13:47 +0000)]
am
42796e97: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
42796e97f64ee7ab3dafaf2daf9ebbc2f35030a2':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 13:42:01 +0000 (13:42 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Wed, 4 Mar 2015 13:41:21 +0000 (13:41 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Wed, 4 Mar 2015 13:37:36 +0000 (13:37 +0000)]
am
cba2873e: (-s ours) Import translations. DO NOT MERGE
* commit '
cba2873edc7cba933484180109204839d68dce87':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 13:36:32 +0000 (07:36 -0600)]
Import translations. DO NOT MERGE
Change-Id: Ibbd6d3677d2e146de85bfc7130371546b31cb404
Auto-generated-cl: translation import
Geoff Mendal [Wed, 4 Mar 2015 13:35:11 +0000 (05:35 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ifb9b4ef49d9e590dc0e37eb3f91b5ae6ad0ba693
Auto-generated-cl: translation import
Geoff Mendal [Wed, 4 Mar 2015 13:29:01 +0000 (05:29 -0800)]
Import translations. DO NOT MERGE
Change-Id: I253641b732a51a58cbabaa6b487e37f5eda69e2b
Auto-generated-cl: translation import
Craig Mautner [Tue, 3 Mar 2015 21:08:45 +0000 (21:08 +0000)]
am
358188f5: Merge "Change ActivityView startActivity state sequence" into lmp-mr1-modular-dev
* commit '
358188f5891f5645dbff4fd8cb1a3e7341371f74':
Change ActivityView startActivity state sequence
Dan Sandler [Mon, 2 Mar 2015 03:58:32 +0000 (22:58 -0500)]
Avoid crashing on startup when policy forbids lockscreen camera.
Bug:
19554426
Change-Id: I5b2898d7d114de87d925b5eccc8e4b189e4713de
Craig Mautner [Tue, 3 Mar 2015 21:03:28 +0000 (21:03 +0000)]
Merge "Change ActivityView startActivity state sequence" into lmp-mr1-modular-dev
Eric Gilmore [Tue, 3 Mar 2015 20:10:19 +0000 (12:10 -0800)]
Fixing broken link per b/
19503824.
Change-Id: I4140decb254cf9c9f0eadfce1a3897c240d640d9
Craig Mautner [Fri, 27 Feb 2015 04:40:19 +0000 (20:40 -0800)]
Change ActivityView startActivity state sequence
Problems arise if an activity is started in an ActivityView when the
parent activity is not resumed. In particular the ActivityView can
be brought to the front in front of other activities that have been
started by the parent.
This change checks the state of the parent when the ActivityView is
starting and if it is not resumed, throws an Exception.
This change also removes the queueing up of Intents if the surface
does not exist when startActivity is called. Now, the owner of the
ActivityView is notified when the surface becomes available. If
startActivity is called before that notification an Exception will be
thrown.
Fixes bug
19147472.
Change-Id: I6712cf1929fe65c4238ce7f3feb4e8511ed97244
Nick Kralevich [Tue, 3 Mar 2015 17:08:50 +0000 (17:08 +0000)]
am
98fdff61: am
56fde9e7: Merge "SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates."
* commit '
98fdff61dd651f52d36c0e88dcce8a04568b7cc7':
SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates.
Nick Kralevich [Tue, 3 Mar 2015 17:02:22 +0000 (17:02 +0000)]
am
56fde9e7: Merge "SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates."
* commit '
56fde9e70ef850ca7e3f076e52567f5c75b5e7da':
SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates.
Nick Kralevich [Tue, 3 Mar 2015 16:55:09 +0000 (16:55 +0000)]
Merge "SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates."
Joe Fernandez [Tue, 3 Mar 2015 06:48:21 +0000 (06:48 +0000)]
am
55902316: am
1137ca03: am
246a3a4a: am
14fcef3b: am
c4418980: am
a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
* commit '
559023163d7e9e0aad4846bc0fccfc5c28705ec7':
Minor typo fixes in managed profile Javadoc reference pages.
Joe Fernandez [Tue, 3 Mar 2015 06:42:39 +0000 (06:42 +0000)]
am
1137ca03: am
246a3a4a: am
14fcef3b: am
c4418980: am
a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
* commit '
1137ca03be9b9143c472d9adc51ea511cfd68a6b':
Minor typo fixes in managed profile Javadoc reference pages.
Joe Fernandez [Tue, 3 Mar 2015 06:36:02 +0000 (06:36 +0000)]
am
246a3a4a: am
14fcef3b: am
c4418980: am
a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
* commit '
246a3a4a797edf5850073ec8f6b8aa997947d09b':
Minor typo fixes in managed profile Javadoc reference pages.
Joe Fernandez [Tue, 3 Mar 2015 06:29:33 +0000 (06:29 +0000)]
am
14fcef3b: am
c4418980: am
a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
* commit '
14fcef3bf02f46a057676d7a6d755daee735c4ea':
Minor typo fixes in managed profile Javadoc reference pages.
Rich Slogar [Tue, 3 Mar 2015 06:25:27 +0000 (06:25 +0000)]
am
a08f2047: am
646c7cd6: am
a81ed3cd: docs: support library updates for sdk 22
* commit '
a08f2047025b741b6356d2bf0320da57eda7e2bc':
docs: support library updates for sdk 22
Joe Fernandez [Tue, 3 Mar 2015 06:22:42 +0000 (06:22 +0000)]
am
c4418980: am
a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
* commit '
c4418980a083c1cd26b789297f084e03036b5fdd':
Minor typo fixes in managed profile Javadoc reference pages.
Rich Slogar [Tue, 3 Mar 2015 06:18:54 +0000 (06:18 +0000)]
am
646c7cd6: am
a81ed3cd: docs: support library updates for sdk 22
* commit '
646c7cd6e81904791b7ecc7ab7750ffe4919371b':
docs: support library updates for sdk 22
OSDN Git Service
