OSDN Git Service
Bryce Lee [Mon, 9 Mar 2015 15:49:23 +0000 (15:49 +0000)]
am
1b8df04b: am
8aeab6c8: Allow the keyguard service to be configurable.
* commit '
1b8df04b8d754f68dc6bfa6caa9e0a2666d16933':
Allow the keyguard service to be configurable.
Bryce Lee [Mon, 9 Mar 2015 15:49:13 +0000 (15:49 +0000)]
am
168d0ade: am
1e53b98c: Merge "Allow press and hold from non-interactive." into lmp-mr1-modular-dev
* commit '
168d0ade0cb5a733c83d7dcfdf0a0efa3250cb16':
Allow press and hold from non-interactive.
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.
Nicolas Prevot [Mon, 9 Mar 2015 14:53:22 +0000 (14:53 +0000)]
Merge "Add a new extra to specify the admin component for provisioning."
Nicolas Prevot [Mon, 9 Mar 2015 14:07:17 +0000 (14:07 +0000)]
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
Geoff Mendal [Mon, 9 Mar 2015 14:41:17 +0000 (14:41 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 9 Mar 2015 14:39:13 +0000 (07:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9b6fac7639695f15cc7d1aa5b814bd6fa0872165
Auto-generated-cl: translation import
Geoff Mendal [Mon, 9 Mar 2015 13:55:14 +0000 (13:55 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 9 Mar 2015 13:40:26 +0000 (06:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I433509f59a78920d4e2ac1e5eb4d44fb81b2fd48
Auto-generated-cl: translation import
Geoff Mendal [Mon, 9 Mar 2015 13:23:28 +0000 (06:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id2e79810aa3f2c1beb932786f579feab06b6825a
Auto-generated-cl: translation import
Benjamin Franz [Wed, 11 Feb 2015 10:51:10 +0000 (10:51 +0000)]
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
Tor Norbye [Wed, 4 Mar 2015 18:04:07 +0000 (10:04 -0800)]
Annotate methods with size and range annotations
Change-Id: I666861f0dfae31402b1280e9a966a583b88e2e1a
Tor Norbye [Mon, 2 Mar 2015 18:57:08 +0000 (10:57 -0800)]
Annotate return values with @CheckReturn
Change-Id: Icd8fb6adb591ccd7f35f2336ae716b198abf69c5
Tor Norbye [Mon, 2 Mar 2015 18:11:44 +0000 (10:11 -0800)]
Annotate methods to be called from overrides with @CallSuper
Change-Id: Ibc587c2aaee9f3e7f448079f72a75459fe4e15e7
Andreas Gampe [Sun, 8 Mar 2015 00:17:54 +0000 (00:17 +0000)]
am
3f74f638: am
55966006: am
7a4cb563: Merge "Frameworks/base: Remove unnecessary Pattern instance"
* commit '
3f74f6386a15d09f27dbc81edd8dd2c13e298d73':
Frameworks/base: Remove unnecessary Pattern instance
Andreas Gampe [Sun, 8 Mar 2015 00:17:47 +0000 (00:17 +0000)]
am
208e80d9: am
a3d5b230: am
cdc19f3f: Merge "Frameworks/base: Remove unnecessary Pattern instance"
* commit '
208e80d931fd775de925529e0c36a34e9b7f916a':
Frameworks/base: Remove unnecessary Pattern instance
Mathieu Chartier [Sun, 8 Mar 2015 00:17:40 +0000 (00:17 +0000)]
am
ea3d53f5: am
773bcfa7: am
e59b7ce2: Merge "Add JIT system properties"
* commit '
ea3d53f5a8f8e396bf8918041087db4603d444e5':
Add JIT system properties
Miao Wang [Sun, 8 Mar 2015 00:17:34 +0000 (00:17 +0000)]
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
Miao Wang [Sun, 8 Mar 2015 00:17:27 +0000 (00:17 +0000)]
am
449571c4: am
26f1a538: am
8b86ee9f: Merge "[RenderScript] Add missing variable"
* commit '
449571c45e47e9b8d118c59dbd909b0d512f7e6d':
[RenderScript] Add missing variable
Miao Wang [Sun, 8 Mar 2015 00:17:18 +0000 (00:17 +0000)]
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.
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.
Mike Lockwood [Sat, 7 Mar 2015 23:50:36 +0000 (23:50 +0000)]
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
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
Scott Kennedy [Sat, 7 Mar 2015 01:34:47 +0000 (01:34 +0000)]
Merge "Add more @Nullable annotations"
Scott Kennedy [Sat, 7 Mar 2015 01:24:58 +0000 (17:24 -0800)]
Add more @Nullable annotations
Change-Id: I5b2935eb5e63289d80ebf9bf70741800b1c0934a
Chih-Hung Hsieh [Sat, 7 Mar 2015 01:13:49 +0000 (01:13 +0000)]
Merge "Fix unused local variale warning from clang/llvm."
Chih-Hung Hsieh [Sat, 28 Feb 2015 00:11:36 +0000 (16:11 -0800)]
Fix unused local variale warning from clang/llvm.
Change-Id: Ib9b5d06313e5bf933edfb38a4522929104c7917a
Andreas Gampe [Sat, 7 Mar 2015 01:03:13 +0000 (01:03 +0000)]
Merge "Frameworks/base: Remove unnecessary Pattern instance"
Dianne Hackborn [Sat, 7 Mar 2015 00:44:56 +0000 (00:44 +0000)]
Merge "Add new debug feature to automatically create heap dumps."
Dianne Hackborn [Wed, 4 Mar 2015 01:04:12 +0000 (17:04 -0800)]
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
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
Yigit Boyar [Sat, 7 Mar 2015 00:09:28 +0000 (00:09 +0000)]
Merge "Remove original movements record from GridLayout"
John Reck [Fri, 6 Mar 2015 23:47:25 +0000 (23:47 +0000)]
Merge "Add percentiles"
John Reck [Fri, 6 Mar 2015 22:40:50 +0000 (14:40 -0800)]
Add percentiles
Change-Id: Ieb6badd177bb6f67dda199dfcb3e0f483c8c4e59
Bryce Lee [Fri, 6 Mar 2015 23:21:46 +0000 (15:21 -0800)]
Allow the keyguard service to be configurable.
Change-Id: I811171c228764c3e0e507ad3ce28835ccad9bb31
Tor Norbye [Fri, 6 Mar 2015 23:15:25 +0000 (23:15 +0000)]
Merge "Annotate ARGB integer parameters with @ColorInt"
Tor Norbye [Fri, 6 Mar 2015 23:08:58 +0000 (23:08 +0000)]
Merge "Additional annotations: @CallSuper, @Keep, etc."
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
Mike Lockwood [Fri, 6 Mar 2015 17:18:09 +0000 (09:18 -0800)]
MIDI Manager: Add explicit close mechanism for input and output ports
Relying on errors from closing the file descriptor is not reliable
and was resulting in file descriptor leaks in device servers.
Change-Id: Ib5cc22dba493eae6608a12cc6d4178d8390da77b
Christopher Tate [Fri, 6 Mar 2015 19:43:52 +0000 (19:43 +0000)]
Merge "Don't back up / restore the code_cache/ directory"
Derek Sollenberger [Fri, 6 Mar 2015 18:48:27 +0000 (13:48 -0500)]
SkPorterDuff Multiply mode maps to SkXfermode modulate.
bug:
19627342
Change-Id: I97f26ca1bc8abe2768f4a12cc70fb0fa5d905098
Scott Kennedy [Fri, 6 Mar 2015 18:45:23 +0000 (18:45 +0000)]
Merge "Allow attrs to be @Nullable in TextView and LinearLayout"
Chris Craik [Fri, 6 Mar 2015 18:44:15 +0000 (18:44 +0000)]
Merge "Avoid invalid shader creation for certain blend modes"
Chris Craik [Fri, 6 Mar 2015 18:42:29 +0000 (18:42 +0000)]
Merge "Revert "Revert "Remove references to SkPorterDuff as it is deprecated."""
Chris Craik [Fri, 6 Mar 2015 18:42:15 +0000 (18:42 +0000)]
Revert "Revert "Remove references to SkPorterDuff as it is deprecated.""
Fix build breakage.
This reverts commit
26b4f598c8b1e99b43261614a6861785638c8c00.
Change-Id: If39ce2a41d26a8520091f330234c3d35e413ee92
Chris Craik [Fri, 6 Mar 2015 18:16:44 +0000 (18:16 +0000)]
Merge "Revert "Remove references to SkPorterDuff as it is deprecated.""
Chris Craik [Fri, 6 Mar 2015 18:15:39 +0000 (18:15 +0000)]
Revert "Remove references to SkPorterDuff as it is deprecated."
bug:
19627342
This reverts commit
a9aded1f6253afbea7906509992a8a3721f731ab.
Change-Id: Ic865edfbd31c9e24d18a1397a1d346633376e20a
Chris Craik [Fri, 6 Mar 2015 17:40:35 +0000 (09:40 -0800)]
Avoid invalid shader creation for certain blend modes
bug:
19627342
Change-Id: I41e3c1ce8e6fa52f046ec492d19de7cab92b9ec5
Hiroshi Yamauchi [Fri, 6 Mar 2015 17:43:52 +0000 (17:43 +0000)]
Merge "Deprecate things that rely on Debug.startAllocCounting."
Torne (Richard Coles) [Fri, 6 Mar 2015 17:25:47 +0000 (17:25 +0000)]
Merge "Fix typo in WebSettings javadoc."
Mike Lockwood [Fri, 6 Mar 2015 16:17:33 +0000 (08:17 -0800)]
MidiDeviceService: Add getDeviceInfo() accessor method
so service implementations can access their own device info object.
Change-Id: I93e0c449e72d76568d7b4c9f7f7db00a846b5a33
Glenn Kasten [Fri, 6 Mar 2015 16:14:48 +0000 (16:14 +0000)]
Merge "Fix USB typos"
James Cook [Fri, 6 Mar 2015 15:42:05 +0000 (15:42 +0000)]
Merge "Support undo of some programmatic TextView changes"
Torne (Richard Coles) [Fri, 6 Mar 2015 14:20:00 +0000 (14:20 +0000)]
Fix typo in WebSettings javadoc.
We accidentally repeated the same enum value twice; fixed to mention the
three values correctly.
Change-Id: Iba6a7edd8e1a5b429728056a8f56634427758c73
Mikhail Naganov [Mon, 9 Feb 2015 17:01:40 +0000 (17:01 +0000)]
Provide better error reporting for WebView
Add new callbacks into WebViewClient that will provide notifications
about subresource loading errors and HTTP errors received from servers.
Bug:
19313118
Change-Id: Idb47f53ef7e72cb95f3e9b89d1e238d69e896b8b
Scott Kennedy [Fri, 6 Mar 2015 03:15:11 +0000 (19:15 -0800)]
Allow attrs to be @Nullable in TextView and LinearLayout
Change-Id: I46ac6cddf010e7ce59de6272c30e824104e28acb
Lajos Molnar [Fri, 6 Mar 2015 03:09:18 +0000 (03:09 +0000)]
Merge "media: update AMessage to use handler instead of handler-id"
Christopher Tate [Fri, 6 Mar 2015 02:31:38 +0000 (18:31 -0800)]
Don't back up / restore the code_cache/ directory
Bug
19628750
Change-Id: I1f2f5e8083675bf70d17c0c143dc813ca9e04610
Scott Kennedy [Fri, 6 Mar 2015 02:31:28 +0000 (02:31 +0000)]
Merge "Mark setAccessibilityDelegate()'s argument as @Nullable"
Christopher Tate [Fri, 6 Mar 2015 02:05:33 +0000 (02:05 +0000)]
Merge "Don't enqueue allowBackup=false apps for full backup attempts"
Christopher Tate [Wed, 4 Mar 2015 00:19:44 +0000 (16:19 -0800)]
Don't enqueue allowBackup=false apps for full backup attempts
We are correctly refusing to actually process apps for backup if they have
declared android:allowBackup="false" in their manifests, but we're still
wasting bookkeeping & a certain amount of work in tracking them as part of
the full backup queue. Fix that; now we recognize that they shouldn't be
in the queue in the first place.
When reinflating the queue at boot time we also re-verify the participation
of each mentioned app so that we properly drop ones that have been uninstalled
or altered such that they are no longer full-data backup candidates.
Finally, if an app previously implemented key/value backup, so we think
we'll be running it in that mode in a future backup pass, but has been
updated to use the full-data path instead, we don't want to go ahead and
run a key/value pass on it. Added a backstop check and proceed gracefully
in this situation.
(Also add bit more debug-build logging to LocalTransport)
Bug
19462310
Change-Id: I07ab4f2e68e92766d9e8f2595fa763c91193d743
Scott Kennedy [Fri, 6 Mar 2015 01:48:31 +0000 (17:48 -0800)]
Mark setAccessibilityDelegate()'s argument as @Nullable
Change-Id: I3c087e953e29e81285fc8efa4157f694eeaf075d
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"
Andrew Lee [Fri, 6 Mar 2015 01:05:07 +0000 (01:05 +0000)]
Merge "Add methods for device telephony configs."
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
Dan Sandler [Fri, 6 Mar 2015 00:39:10 +0000 (00:39 +0000)]
am
eef3fbcf: am
8deb6d95: am
e6a4b445: am
3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev
* commit '
eef3fbcf6825a5e5e0cb150123d9bc87956fbb23':
Avoid crashing on startup when policy forbids lockscreen camera.
Miao Wang [Fri, 6 Mar 2015 00:34:51 +0000 (00:34 +0000)]
Merge "[RenderScript] Add missing variable"
Tor Norbye [Mon, 2 Mar 2015 17:39:27 +0000 (09:39 -0800)]
Annotate ARGB integer parameters with @ColorInt
Change-Id: I307f72a382272cf18ddb6b07d9fcb81228568d9a
Tor Norbye [Mon, 2 Mar 2015 15:55:51 +0000 (07:55 -0800)]
Additional annotations: @CallSuper, @Keep, etc.
These mirror the new support library annotations, but
with source retention.
Change-Id: Ib85ceeb37d596aae8cf12d4f8fede3982552d033
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:56:53 +0000 (23:56 +0000)]
am
7a79c4ca: am
f8d6a4ba: resolved conflicts for merge of
701f9c2f to stage-aosp-master
* commit '
7a79c4cac3b0c722832e868346db2375b6d6c379':
Stop using namespace std.
John Reck [Thu, 5 Mar 2015 23:55:13 +0000 (23:55 +0000)]
Merge "Cleanup Bitmap JNI attempt #2"
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."
Eric Gilmore [Thu, 5 Mar 2015 23:46:49 +0000 (23:46 +0000)]
am
dcfa5e03: 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 '
dcfa5e03f76e6ba9579125669d07cac09cde8cd2':
Re-fixing link, and removing trailing white space.
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
Julia Reynolds [Thu, 5 Mar 2015 23:39:02 +0000 (23:39 +0000)]
Merge "Allow device and profile owners to set a user icon."
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.