OSDN Git Service
Filip Gruszczynski [Mon, 18 Jan 2016 21:20:58 +0000 (13:20 -0800)]
Create dim layer surfaces only when they are necessary.
Instead of creating the surfaces for dim layers the moment when the
dim layer is constructed, we can save memory until the dim layer is
actually used and allocate the surface then.
Change-Id: Iedd717d198faf2df3ff39a41537ec0e1018c7ca9
Matthew Williams [Wed, 20 Jan 2016 00:14:42 +0000 (00:14 +0000)]
Merge "Revert "Redact Account info from getCurrentSyncs""
Matthew Williams [Wed, 20 Jan 2016 00:12:25 +0000 (00:12 +0000)]
Revert "Redact Account info from getCurrentSyncs"
This reverts commit
b63057e698a01dafcefc7ba09b397b0336bba43d.
Reverting this b/c http://droidmerger-01.mtv.corp.google.com:8888/googleplex/branch/lmp-dev
claims there's an automerge path from lmp-dev all the way to master.
Change-Id: Ia99a20410153442436ea836b5223a524b640dcbf
Shreyas Basarge [Wed, 20 Jan 2016 00:08:50 +0000 (00:08 +0000)]
Merge "NPE fix in SyncStorageEngine"
Yohei Yukawa [Wed, 20 Jan 2016 00:03:37 +0000 (00:03 +0000)]
Merge "There should be a way to clear additional subtypes."
Matthew Williams [Tue, 19 Jan 2016 23:58:11 +0000 (23:58 +0000)]
Merge "Redact Account info from getCurrentSyncs"
Aga Wronska [Tue, 19 Jan 2016 23:34:21 +0000 (23:34 +0000)]
Merge "Refactor SearchManager:"
Rubin Xu [Tue, 19 Jan 2016 23:31:32 +0000 (23:31 +0000)]
Merge "Add JNI bridge to the new logd security buffer."
Matthew Williams [Tue, 19 Jan 2016 23:04:04 +0000 (23:04 +0000)]
Redact Account info from getCurrentSyncs
BUG:
26094635
If the caller to ContentResolver#getCurrentSyncs does not hold the
GET_ACCOUNTS permission, return a SyncInfo object that does not
contain any Account information.
Change-Id: I5628ebe1f56c8e3f784aaf1b3281e6b829d19314
Tony Mak [Tue, 19 Jan 2016 23:08:30 +0000 (23:08 +0000)]
Merge "Make getInstalledDialerApplications to query for specific user"
Rob Carr [Tue, 19 Jan 2016 22:59:10 +0000 (22:59 +0000)]
Merge "Replace SurfaceViews across resize trigerred relaunches."
Winson [Mon, 18 Jan 2016 23:18:37 +0000 (15:18 -0800)]
Removing extraneous calls.
- Removing calls to ensureCapacity, which was causing reallocations when
using a temporary set with multiple uses.
- Fixing issue with update callback not being called when immediately
updating a TaskView’s transform
- Adding utility methods in preparation for refactoring code
Change-Id: If62c3751ed6af15092a34435df08bb4d627536ea
Winson [Tue, 19 Jan 2016 19:30:51 +0000 (11:30 -0800)]
Fix regression with drop targets not being visible.
- This happened because the RecentsView had the same priority as the
touch handler, which updates the visible dock states, which RV uses
to determine what to draw, resulting in the first time after rotation
to not show the right targets. The touch handler should now have a
higher priority than the view that depends on it.
Change-Id: I9441e34f677fe105757c237db0f6970e7cf8203b
Robert Carr [Wed, 13 Jan 2016 21:19:58 +0000 (13:19 -0800)]
Replace SurfaceViews across resize trigerred relaunches.
In resize modes where we are preserving the main application
window, we need to tell the WindowManager to prepare to replace
the child surfaces, or they will dissapear across relaunches.
Bug:
26070641
Change-Id: I864168688dc320e9280e651f9c5df614f52bc96c
Alan Viverette [Tue, 19 Jan 2016 21:43:33 +0000 (21:43 +0000)]
Merge "Animate context popup menu around origin point"
Aga Wronska [Sat, 16 Jan 2016 01:30:15 +0000 (17:30 -0800)]
Refactor SearchManager:
- Move SearchManager out of BaseActivity.
- Refactor usage of onCurrentDirectoryChanged(int anim).
- Cancel search when directory changes.
- Enable testing for cancelling search when directory changes.
- Avoid recreating action bar when only the content of the directory is
changed.
BUG=
26495573
Change-Id: I1400090fcb529ad3905018d1640fdb7416542989
Filip Gruszczynski [Tue, 19 Jan 2016 21:26:55 +0000 (21:26 +0000)]
Merge "Don't remove task needed for reuse when clearing during activity start."
John Reck [Tue, 19 Jan 2016 21:21:33 +0000 (21:21 +0000)]
Merge "Fix ordering of texture->upload arguments"
Filip Gruszczynski [Tue, 19 Jan 2016 20:23:10 +0000 (12:23 -0800)]
Don't remove task needed for reuse when clearing during activity start.
Bug:
26541093
Change-Id: I4ed39110e9bd72e5f7e11a49acc0a36dc8414df4
John Reck [Tue, 19 Jan 2016 19:46:52 +0000 (11:46 -0800)]
Fix ordering of texture->upload arguments
Caught by scatter-shotting GL_CHECKPOINTS which
seem generally useful to have
Bug:
26609444
Change-Id: Ie31d9297d8dae56405126720f338b4256c8bae77
Ruben Brunk [Tue, 19 Jan 2016 20:54:44 +0000 (20:54 +0000)]
Merge "Update LightsService to use low-persistence mode."
Lenka Trochtova [Tue, 19 Jan 2016 20:51:30 +0000 (20:51 +0000)]
Merge "Add a system config flag for making all guests ephemeral."
Lenka Trochtova [Tue, 22 Dec 2015 13:26:18 +0000 (14:26 +0100)]
Add a system config flag for making all guests ephemeral.
BUG:
25737696
Change-Id: I4c915ba97431a6f9f0aee2d93b618a5add51c766
Doris Liu [Tue, 19 Jan 2016 20:42:03 +0000 (20:42 +0000)]
Merge "Revert "Get animation update timing for AVD"" into mnc-dr1.5-dev am:
a466e15223 am:
22116275aa
am:
574277d65a -s ours
* commit '
574277d65ad41ba34db5365000365a1b471be531':
Revert "Get animation update timing for AVD"
Filip Gruszczynski [Tue, 19 Jan 2016 20:30:35 +0000 (20:30 +0000)]
Merge "Enable enter animation when docking by dragging from recents."
Ruben Brunk [Mon, 28 Dec 2015 22:45:11 +0000 (14:45 -0800)]
Update LightsService to use low-persistence mode.
Bug:
26274041
Bug:
26217194
Change-Id: I4cbee11d0936b6df5b8aed9dfab8d9d1d928f9c3
Doris Liu [Tue, 19 Jan 2016 20:15:14 +0000 (20:15 +0000)]
Merge "Revert "Get animation update timing for AVD"" into mnc-dr1.5-dev am:
a466e15223
am:
22116275aa
* commit '
22116275aa2b7184c65b14c3e92455d76d3c67d4':
Revert "Get animation update timing for AVD"
Doris Liu [Tue, 19 Jan 2016 20:04:36 +0000 (20:04 +0000)]
Merge "Revert "Get animation update timing for AVD"" into mnc-dr1.5-dev
am:
a466e15223
* commit '
a466e15223ad64c5ae5d81e51f571fc45f606920':
Revert "Get animation update timing for AVD"
Doris Liu [Tue, 19 Jan 2016 19:59:53 +0000 (19:59 +0000)]
Merge "Revert "Get animation update timing for AVD"" into mnc-dr1.5-dev
Doris Liu [Tue, 19 Jan 2016 19:50:18 +0000 (19:50 +0000)]
Revert "Get animation update timing for AVD"
This reverts commit
fc8e3cb768b7dfd7c0ed0fb93dd9d735887e8d45.
Bug:
26616870
Change-Id: I2f018cb34f014f4ebb635e18cd940997507a4a4d
Calin Juravle [Tue, 19 Jan 2016 19:51:51 +0000 (19:51 +0000)]
Merge "Enable profile guided compilation on the framework side"
Gustav Sennton [Tue, 19 Jan 2016 19:48:29 +0000 (19:48 +0000)]
Merge "Change API for killing app-depentents to also kill main app."
Adam Lesinski [Tue, 19 Jan 2016 19:45:29 +0000 (19:45 +0000)]
Merge "Fix local builds by adding CleanSpec command"
Calin Juravle [Wed, 23 Dec 2015 16:55:08 +0000 (18:55 +0200)]
Enable profile guided compilation on the framework side
The background compilation service will trigger a profile based
compilation instead of a full one. If no profile information is
available the compilation is skipped (see installd).
Note that the end decision whether or not to compile a package is taken
by dext2oat. We can't make the decision here because this service runs
under system server which cannot read app's profile data.
Bug:
26080105
Change-Id: I457ea8dea0557839c1f7cdc241770055732b0a4a
Adam Lesinski [Tue, 19 Jan 2016 19:39:24 +0000 (11:39 -0800)]
Fix local builds by adding CleanSpec command
Changed the package name of an R.java generated file, so we need
to clean up the old one left behind from a previous build.
Change-Id: I3ece312d367a30d736084736c44238b4e52d22d7
Tony Mak [Tue, 19 Jan 2016 19:05:18 +0000 (19:05 +0000)]
Make getInstalledDialerApplications to query for specific user
BUG=
26634502
Change-Id: I8fe5506589bae85e3babba1aaab3b737cd12543b
Tony Mak [Tue, 19 Jan 2016 19:32:41 +0000 (19:32 +0000)]
Merge "Telecom shell command accepts userhandle as argument of phone account"
Tony Mak [Mon, 11 Jan 2016 14:38:11 +0000 (14:38 +0000)]
Telecom shell command accepts userhandle as argument of phone account
We need a sort of way to enable phone account in managed profile for
writing cts running in managed profile.
Change-Id: I2e869e792c6e145c93a314f64a5de98e2f6e315f
Felipe Leme [Tue, 19 Jan 2016 19:26:59 +0000 (19:26 +0000)]
Merge "Skip zip regeneration when user didn't provide extra info."
Xiaohui Chen [Tue, 19 Jan 2016 19:25:53 +0000 (19:25 +0000)]
Merge "sysui: small refactor and delete dead code"
Alan Viverette [Tue, 19 Jan 2016 19:07:31 +0000 (14:07 -0500)]
Animate context popup menu around origin point
Also enables the context popup menu enter transition.
Bug:
25801140
Change-Id: Id7fb384e8ac8974189b32a052352bd2f6cbb176e
Jason Monk [Tue, 19 Jan 2016 19:03:19 +0000 (19:03 +0000)]
Merge "Support data usage changes in Settings"
Etan Cohen [Tue, 19 Jan 2016 18:48:14 +0000 (18:48 +0000)]
Merge "WLAN wake reason accounting from driver."
Jean-Michel Trivi [Tue, 19 Jan 2016 18:46:09 +0000 (18:46 +0000)]
Merge "Fix AudioAttributes.Builder.setFlags() javadoc"
Xiaohui Chen [Thu, 17 Dec 2015 00:38:13 +0000 (16:38 -0800)]
sysui: small refactor and delete dead code
Bug:
26068752
Change-Id: I1af018ff9b74779ea663fc9e90b47a8fad70447e
John Reck [Tue, 19 Jan 2016 18:42:21 +0000 (18:42 +0000)]
Merge "fix race condition between HWUI cache and renderThread" am:
2c2b5e8514
am:
4354ae9883
* commit '
4354ae9883ae1282ac457539f46d529bdfa89fec':
fix race condition between HWUI cache and renderThread
Felipe Leme [Tue, 19 Jan 2016 18:31:39 +0000 (10:31 -0800)]
Skip zip regeneration when user didn't provide extra info.
If the user provides a title or description, it's necessary to create a
new zip file with the contents of the old file plus the new entries,
which takes time.
Hence, if the user didn't provide more info (title or description), we
should skip that step.
BUG:
26616935
Change-Id: Ice14f88b5763d463d8db2f942e823797e80bfde9
John Reck [Tue, 19 Jan 2016 18:38:11 +0000 (18:38 +0000)]
Merge "fix race condition between HWUI cache and renderThread"
am:
2c2b5e8514
* commit '
2c2b5e8514247d8524778d209f26b7dbde19d142':
fix race condition between HWUI cache and renderThread
John Reck [Tue, 19 Jan 2016 18:29:30 +0000 (18:29 +0000)]
Merge "fix race condition between HWUI cache and renderThread"
Jason Monk [Mon, 18 Jan 2016 15:09:50 +0000 (10:09 -0500)]
Tuner control over volume policy.
Change-Id: Ic96ad05a9aab6fc2a1669cfe5f1ba1f3779e1b5e
Jason Monk [Tue, 19 Jan 2016 18:22:13 +0000 (18:22 +0000)]
Merge "Add zen panel to volume dialog again in tuner"
John Reck [Tue, 19 Jan 2016 17:48:22 +0000 (17:48 +0000)]
Merge "Revert "Switch to new rendering pipeline""
Clara Bayarri [Tue, 19 Jan 2016 17:47:40 +0000 (17:47 +0000)]
Merge "Work Challenge unlock to home instead of locked app"
Clara Bayarri [Thu, 14 Jan 2016 12:30:42 +0000 (12:30 +0000)]
Work Challenge unlock to home instead of locked app
When a Work Challenge is in place and we are unlocking the device
to a foreground work app that should be locked, take the user to the
home screen instead to avoid them seeing two lock screens in a row.
Bug:
26579952
Change-Id: I6220aac730fbb1da3c3042d0f232cb9cbb18ec4b
John Reck [Tue, 19 Jan 2016 17:42:15 +0000 (09:42 -0800)]
Revert "Switch to new rendering pipeline"
This reverts commit
3daf4d3272f2cc6ce3b5a572b9d4dcce1654086d.
Temporarily disable due to high rate of crashes from endLayer check
Bug:
26609444
Change-Id: I7583a77bf5cc1e722fa4042db0542f80cd978760
Chet Haase [Tue, 19 Jan 2016 17:33:14 +0000 (17:33 +0000)]
Merge "Add AutoCancelTest back to framework tests"
Jonathan Basseri [Tue, 19 Jan 2016 17:09:50 +0000 (17:09 +0000)]
Merge "Un-hide carrier config keys."
Akshay Kannan [Tue, 19 Jan 2016 17:08:50 +0000 (17:08 +0000)]
Merge "Flip EMERGENCY_ASSISTANCE_ENABLED to true Bug:
23591361"
Chet Haase [Tue, 19 Jan 2016 16:52:08 +0000 (08:52 -0800)]
Add AutoCancelTest back to framework tests
This test used to fail consistently, but currently passes.
Adding it back to see whether whatever was causing it to fail has
since been fixed. If not, need to get failure logs to see what the problem
is during the automatic runs.
Issue #
23807249 Fix AutoCancelTest or delete it
Change-Id: Ied0e0d3a700d9ba36d4d5ef8ca95b8072e639851
Robin Lee [Tue, 19 Jan 2016 16:51:56 +0000 (16:51 +0000)]
Merge "[VPN] start lockdown before user is unlocked"
Robin Lee [Thu, 17 Dec 2015 11:42:22 +0000 (11:42 +0000)]
[VPN] start lockdown before user is unlocked
Removed the dependency on KeyStore encryption by removing that flag for
VPN profiles which don't use secure credentials when saving in Settings.
Old encrypted profiles will simply fail to load untile USER_PRESENT is
sent, as before.
Bug:
26108660
Change-Id: I2677d741d54252f15cb772c94ce1b39041f1e19c
Diego Perez [Tue, 19 Jan 2016 15:53:12 +0000 (15:53 +0000)]
Fix bug in PropertyValuesHolder_Delegate method index am:
ada8c117b1
am:
0eac32be0b
* commit '
0eac32be0b7804184ad5e61af87f79d45b82c6b2':
Fix bug in PropertyValuesHolder_Delegate method index
Diego Perez [Tue, 19 Jan 2016 15:49:16 +0000 (15:49 +0000)]
Fix bug in PropertyValuesHolder_Delegate method index
am:
ada8c117b1
* commit '
ada8c117b197dd61bd472399147dd18ff337a204':
Fix bug in PropertyValuesHolder_Delegate method index
John Reck [Tue, 19 Jan 2016 15:38:16 +0000 (15:38 +0000)]
Merge "Hard-abort tests if LOG_ALWAYS_FATAL"
Martijn Coenen [Tue, 19 Jan 2016 15:32:36 +0000 (15:32 +0000)]
Merge "NFC: Allow apps to specify they're done with tag."
Jason Monk [Mon, 18 Jan 2016 14:21:45 +0000 (09:21 -0500)]
Add zen panel to volume dialog again in tuner
Change-Id: Ie74a6bd8ecd7f2d8b16e96cc0087e63796d5f9a2
Rubin Xu [Tue, 19 Jan 2016 14:24:45 +0000 (14:24 +0000)]
Merge "Reload active profiles when constructing WorkModeTile"
Shreyas Basarge [Tue, 19 Jan 2016 11:46:37 +0000 (11:46 +0000)]
Merge "Fix for possible NPE in JobScheduler"
Diego Perez [Tue, 19 Jan 2016 10:42:19 +0000 (10:42 +0000)]
Fix bug in PropertyValuesHolder_Delegate method index
The method index in PropertyValuesHolder was using only the method name
+ the number of parameters in the call to index the different properties
methods. This worked ok most of the time because, for a given method
name (let's say setTrimStartOffset), the class is usually the same.
However, if the same method name is used in multiple classes, this will
cause collisions and will most likely crash.
Change-Id: Ie6fa8872c5c5e69e690f4f1bb79191a31bef2a28
Diego Perez [Tue, 19 Jan 2016 10:39:46 +0000 (10:39 +0000)]
New path interpolation to paint vector drawables am:
b9c48d8f49
am:
6952063e71
* commit '
6952063e7166599f5300427019ca845bbaafa660':
New path interpolation to paint vector drawables
Diego Perez [Tue, 19 Jan 2016 10:35:49 +0000 (10:35 +0000)]
New path interpolation to paint vector drawables
am:
b9c48d8f49
* commit '
b9c48d8f49d35e2682c7205a9d8d5fcc25d7c736':
New path interpolation to paint vector drawables
Diego Perez [Fri, 18 Dec 2015 16:01:24 +0000 (16:01 +0000)]
New path interpolation to paint vector drawables
Before this CL, PathMeasure_Delegate would use Path_Delegate.approximate
to get a path segment to draw. Path_Delegate.approximate uses a
flattening iterator to do the path approximation.
Unfortunately, because we do not control the stroke mode while painting,
in some cases the approximation would draw unwanted artifacts caused by
the rough approximation and the use of wrong miter values.
This CL does a much better calculation of the path and interpolates the
segments of the curves instead of replacing them with line segments.
This also fixes an issue with the calculation of empty paths.
Bug: http://b.android.com/187256
Change-Id: I450f7aa4c3d9efcbf902a40c3b4d6d388546893f
Thomas Buhot [Mon, 18 Jan 2016 09:31:58 +0000 (10:31 +0100)]
fix race condition between HWUI cache and renderThread
getMaximumBitmapWidth() and getMaximumBitmapHeight() of DisplayListCanvas
need HWUI cache instance. Since the initialization of the cache is
asynchronous it may crash if not yet ready. Add a staticFence() call
to guarantee the cache has been created prior issuing the call.
Change-Id: I5ed9e5cc084444c8d1872a77fef50e294ae14e93
Signed-off-by: Thomas Buhot <thomas.buhot@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
Filip Gruszczynski [Tue, 19 Jan 2016 04:18:59 +0000 (04:18 +0000)]
Merge "Fix several small logging issues."
Daichi Hirono [Tue, 19 Jan 2016 03:24:00 +0000 (03:24 +0000)]
Merge "Start to use app fuse in MtpDocumentsProvider."
Filip Gruszczynski [Tue, 19 Jan 2016 02:31:18 +0000 (02:31 +0000)]
Merge "Temporary logging to debug ActivityStarter crash."
Filip Gruszczynski [Tue, 19 Jan 2016 02:29:17 +0000 (02:29 +0000)]
Merge "Fix NPE when checking if recents should be launched in docked mode."
Daichi Hirono [Mon, 11 Jan 2016 09:07:01 +0000 (18:07 +0900)]
Start to use app fuse in MtpDocumentsProvider.
BUG=
25756419
Change-Id: I050e7cf7523926710291875737602e95c47be088
Jaesung Chung [Tue, 19 Jan 2016 01:17:18 +0000 (01:17 +0000)]
Merge "Extend MediaScanner and MtpDatabase to support RAW image files"
Daichi Hirono [Tue, 19 Jan 2016 00:48:28 +0000 (00:48 +0000)]
Merge "Clean MtpManagerTest code."
Jaesung Chung [Fri, 18 Dec 2015 04:50:21 +0000 (05:50 +0100)]
Extend MediaScanner and MtpDatabase to support RAW image files
Bug:
25871812
Change-Id: Iee92632585dc9020238a9b562defd06d6d2a91dc
Jaesung Chung [Tue, 19 Jan 2016 00:37:13 +0000 (00:37 +0000)]
Merge "ExifInterface: add support for reading metadata from RAW images"
Martijn Coenen [Mon, 18 Jan 2016 16:52:44 +0000 (08:52 -0800)]
NFC: Allow apps to specify they're done with tag.
When an application is no longer interested in
communicating with a tag, but the tag is kept in
range of the device for a long amount of time, we
will burn a lot of power keeping the connection
to it alive.
Instead, allow the app to signal it's "done" with
the tag, which allows us to put the controller
in a low-power mode. This will save power in scenarios
such as an NFC tag embedded in a car dock or
wireless charging dock.
Bug:
26426491
Change-Id: I7a0149ede46e0c7610b06ed1776344b772677350
Neil Fuller [Mon, 18 Jan 2016 19:01:41 +0000 (19:01 +0000)]
Merge "Fix for Settings timezone names when boot time is wrong"
Sudheer Shanka [Mon, 18 Jan 2016 18:28:55 +0000 (18:28 +0000)]
Merge "Add an util method and update setMenuItemAsDisabledByAdmin."
Filip Gruszczynski [Mon, 18 Jan 2016 18:02:00 +0000 (10:02 -0800)]
Fix several small logging issues.
This includes:
1) invert HIDE_STACK_CRAWLS to SHOW_STACK_CRAWLS so it's immediately
clear from the config file that something is enabled (if anything is
true).
2) Merge stack collection code into a method, so we can remove the
repeated code.
3) Remove copying of some constants in AppTransition and just import
them directly.
Change-Id: I3190ee0a5963720ac6285b4f48b2705e84f04ab5
Sudheer Shanka [Mon, 18 Jan 2016 18:00:44 +0000 (18:00 +0000)]
Merge "Add extra utility method to RestrictedLockUtils."
Geoff Mendal [Mon, 18 Jan 2016 17:48:13 +0000 (17:48 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 18 Jan 2016 17:43:11 +0000 (18:43 +0100)]
Import translations. DO NOT MERGE
Change-Id: Ie34a0366716390f8027fafe3818510be86f8f2fe
Auto-generated-cl: translation import
Sudheer Shanka [Mon, 18 Jan 2016 17:24:19 +0000 (17:24 +0000)]
Merge "Remove spacing when removing padlock and add more util methods."
Sudheer Shanka [Mon, 18 Jan 2016 11:22:45 +0000 (11:22 +0000)]
Remove spacing when removing padlock and add more util methods.
When adding the padlock, a space is appended to the string which needs
to removed along with the padlock. And added more utility methods in
RestrictedLockUtils.
Change-Id: I33f976db23bfdd39d76c4201be0727bfafb00fd4
Filip Gruszczynski [Mon, 18 Jan 2016 16:59:45 +0000 (08:59 -0800)]
Enable enter animation when docking by dragging from recents.
This requires further work on the sysui side (the view disappears
before the animation starts), but it shows that existing
infrastructure on the WMS side is sufficient.
Bug:
24913915
Change-Id: I7ce20fdd21ee76db4720a3d0fefdfa221b0e96bf
Alan Treadway [Mon, 18 Jan 2016 16:51:12 +0000 (16:51 +0000)]
Merge "Fix documentation for hidden intent."
Alan Treadway [Mon, 18 Jan 2016 16:42:30 +0000 (16:42 +0000)]
Fix documentation for hidden intent.
Change-Id: If3325f75cff759260e42e5b3782c267cb7c1f001
Sudheer Shanka [Mon, 18 Jan 2016 16:11:42 +0000 (16:11 +0000)]
Merge "Check for null values when copying enforcedAdmin in QSTile.State."
Sudheer Shanka [Mon, 18 Jan 2016 11:18:35 +0000 (11:18 +0000)]
Check for null values when copying enforcedAdmin in QSTile.State.
Bug:
26612685
Change-Id: I8228d1dffc3623d3589b51c6c33f07cc53605ef2
Geoff Mendal [Mon, 18 Jan 2016 15:31:19 +0000 (15:31 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am:
7819c3b859 -s ours
am:
26ada7e789 -s ours
* commit '
26ada7e78993241d702a908eae93d174cbb3c8b3':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 18 Jan 2016 15:26:34 +0000 (15:26 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am:
7819c3b859 -s ours
* commit '
7819c3b8591035426eb9b5706f816a95644422ea':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 18 Jan 2016 15:23:52 +0000 (15:23 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Mon, 18 Jan 2016 15:19:19 +0000 (10:19 -0500)]
Import translations. DO NOT MERGE
Change-Id: I581155468832227ff209fc60743a2735b34f91a2
Auto-generated-cl: translation import