OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "TIF: Address API review comments" into nyc-dev
Dongwon Kang [Tue, 1 Mar 2016 22:11:43 +0000 (22:11 +0000)]
Merge "TIF: Address API review comments" into nyc-dev

8 years agoMerge "Clear child fragment manager after it is destroyed." into nyc-dev
George Mount [Tue, 1 Mar 2016 21:41:44 +0000 (21:41 +0000)]
Merge "Clear child fragment manager after it is destroyed." into nyc-dev

8 years agoMerge "Ensure that fragments are created in added order." into nyc-dev
George Mount [Tue, 1 Mar 2016 21:40:53 +0000 (21:40 +0000)]
Merge "Ensure that fragments are created in added order." into nyc-dev

8 years agoMerge "Don't assert against Recents title." into nyc-dev
Steve McKay [Tue, 1 Mar 2016 21:39:25 +0000 (21:39 +0000)]
Merge "Don't assert against Recents title." into nyc-dev

8 years agoDon't assert against Recents title.
Steve McKay [Tue, 1 Mar 2016 20:57:44 +0000 (12:57 -0800)]
Don't assert against Recents title.

It was causing a failure.

Bug: 27383076
Change-Id: Ieb4693783831443e05f32333c181371b0eb4fb93

8 years agoMerge "Show error message when pairing fails in SUW." into nyc-dev
Michael Wright [Tue, 1 Mar 2016 21:32:05 +0000 (21:32 +0000)]
Merge "Show error message when pairing fails in SUW." into nyc-dev

8 years agoMerge "Revert "add all those great comments from the other file."" into nyc-dev
Chris Wren [Tue, 1 Mar 2016 21:02:49 +0000 (21:02 +0000)]
Merge "Revert "add all those great comments from the other file."" into nyc-dev

8 years agoRevert "add all those great comments from the other file."
Chris Wren [Tue, 1 Mar 2016 21:02:21 +0000 (21:02 +0000)]
Revert "add all those great comments from the other file."

This reverts commit 72a4bbc694aef402a9a3fc1656d8bf26decaeb70.

Change-Id: Ib351cdd85b8daf17fecc23a3851dda9fb89e477c

8 years agoMerge "Fix issue #27317952: PendingIntent.getIntent() should be protected" into nyc-dev
Dianne Hackborn [Tue, 1 Mar 2016 20:57:01 +0000 (20:57 +0000)]
Merge "Fix issue #27317952: PendingIntent.getIntent() should be protected" into nyc-dev

8 years agoMerge "Revert "Revert "Remove deprecated methods / classes""" into nyc-dev
Todd Kennedy [Tue, 1 Mar 2016 20:39:57 +0000 (20:39 +0000)]
Merge "Revert "Revert "Remove deprecated methods / classes""" into nyc-dev

8 years agoMerge "Changed logging format of lost windows to reduce confusion." into nyc-dev
Wale Ogunwale [Tue, 1 Mar 2016 20:34:49 +0000 (20:34 +0000)]
Merge "Changed logging format of lost windows to reduce confusion." into nyc-dev

8 years agoMerge "Add activity onStop lifecycle to event logs." into nyc-dev
Wale Ogunwale [Tue, 1 Mar 2016 20:34:11 +0000 (20:34 +0000)]
Merge "Add activity onStop lifecycle to event logs." into nyc-dev

8 years agoMerge "More sensible return code for Credentials.deleteAll" into nyc-dev
Robin Lee [Tue, 1 Mar 2016 20:25:18 +0000 (20:25 +0000)]
Merge "More sensible return code for Credentials.deleteAll" into nyc-dev

8 years agoMerge "Fix difference in icon size for quick QS" into nyc-dev
Jason Monk [Tue, 1 Mar 2016 20:10:22 +0000 (20:10 +0000)]
Merge "Fix difference in icon size for quick QS" into nyc-dev

8 years agoMerge "ConnectivityService: listen to USER_UNLOCKED too" into nyc-dev
Robin Lee [Tue, 1 Mar 2016 20:09:44 +0000 (20:09 +0000)]
Merge "ConnectivityService: listen to USER_UNLOCKED too" into nyc-dev

8 years agoMerge "Hide android.bluetooth.OobData" into nyc-dev
Jakub Pawlowski [Tue, 1 Mar 2016 20:04:33 +0000 (20:04 +0000)]
Merge "Hide android.bluetooth.OobData" into nyc-dev

8 years agoMerge "Improve mergeability of metrics_constants.proto" into nyc-dev
Adrian Roos [Tue, 1 Mar 2016 20:00:51 +0000 (20:00 +0000)]
Merge "Improve mergeability of metrics_constants.proto" into nyc-dev

8 years agoFix difference in icon size for quick QS
Jason Monk [Tue, 1 Mar 2016 20:00:16 +0000 (15:00 -0500)]
Fix difference in icon size for quick QS

Bug: 27371482
Change-Id: I7c1316bf3b3ff6dfde0a92a6c8b9599c2f203503

8 years agoImprove mergeability of metrics_constants.proto
Adrian Roos [Thu, 25 Feb 2016 19:58:32 +0000 (11:58 -0800)]
Improve mergeability of metrics_constants.proto

Change-Id: I6f964d85b5d1b85a04bc8ac2a87453455be93719

8 years agoFixing regression in creating dismiss descriptions.
Winson [Tue, 1 Mar 2016 19:56:30 +0000 (11:56 -0800)]
Fixing regression in creating dismiss descriptions.

Bug: 27411256
Change-Id: I39f56257544d593838349049208fe59f551100eb

8 years agoMerge "Skip animation in error case, log for further investigation." into nyc-dev
Winson Chung [Tue, 1 Mar 2016 19:57:03 +0000 (19:57 +0000)]
Merge "Skip animation in error case, log for further investigation." into nyc-dev

8 years agoMerge "Add deprecated annotation to launchManageBlockedNumbersActivity API." into...
Abhijith Shastry [Tue, 1 Mar 2016 19:56:05 +0000 (19:56 +0000)]
Merge "Add deprecated annotation to launchManageBlockedNumbersActivity API." into nyc-dev

8 years agoMerge "Suppress StopInfo exception based on target API." into nyc-dev
Jeff Sharkey [Tue, 1 Mar 2016 19:55:12 +0000 (19:55 +0000)]
Merge "Suppress StopInfo exception based on target API." into nyc-dev

8 years agoMerge "add all those great comments from the other file." into nyc-dev
Chris Wren [Tue, 1 Mar 2016 19:38:44 +0000 (19:38 +0000)]
Merge "add all those great comments from the other file." into nyc-dev

8 years agoadd all those great comments from the other file.
Chris Wren [Tue, 1 Mar 2016 19:31:56 +0000 (14:31 -0500)]
add all those great comments from the other file.

Bug: 27429645
Change-Id: Ice3b1d01f27fa872191cd07f54b55a51733f77a1

8 years agoMerge "Handle density changes in QS" into nyc-dev
Jason Monk [Tue, 1 Mar 2016 19:26:55 +0000 (19:26 +0000)]
Merge "Handle density changes in QS" into nyc-dev

8 years agoSuppress StopInfo exception based on target API.
Jeff Sharkey [Tue, 1 Mar 2016 18:22:59 +0000 (11:22 -0700)]
Suppress StopInfo exception based on target API.

Bug: 27429026
Change-Id: Ibf0b058b1f921c20fbc3c72045467883a8934f67

8 years agoNotification groups with only one child behave nicer when swiping
Selim Cinek [Tue, 1 Mar 2016 04:43:55 +0000 (20:43 -0800)]
Notification groups with only one child behave nicer when swiping

When swiping the last child of a group away the notification parent
is now swiped instead of the child, unless it is non-dismissable.

Bug: 27420342
Change-Id: Idbb1fac5e46a5a91af829973ee167ad400be82a5

8 years agoFixed a bug where children were not / incorrectly userlocked
Selim Cinek [Tue, 1 Mar 2016 04:03:08 +0000 (20:03 -0800)]
Fixed a bug where children were not / incorrectly userlocked

This can lead to all sorts of weird behavior

Bug: 24866646
Change-Id: If3395c5f1b524592cd658a57ac91d2a0fe893011

8 years agoExpanding first child in a group now if it's the only one
Selim Cinek [Tue, 1 Mar 2016 03:57:35 +0000 (19:57 -0800)]
Expanding first child in a group now if it's the only one

When expanding notifications, the first child is now expanded
if it's the only one in there.

Bug: 27419554
Change-Id: Icdadbb7036e4cd5964de4c2e96e6a8322052bc93

8 years agoMerge "Fix QS edit BGs" into nyc-dev
Jason Monk [Tue, 1 Mar 2016 19:14:31 +0000 (19:14 +0000)]
Merge "Fix QS edit BGs" into nyc-dev

8 years agoMerge "AudioTrack: docs for getUnderrunCount()" into nyc-dev
Phil Burk [Tue, 1 Mar 2016 19:13:38 +0000 (19:13 +0000)]
Merge "AudioTrack: docs for getUnderrunCount()" into nyc-dev

8 years agoMerge "Add use for audio_unique_id_t" into nyc-dev
Glenn Kasten [Tue, 1 Mar 2016 19:10:48 +0000 (19:10 +0000)]
Merge "Add use for audio_unique_id_t" into nyc-dev

8 years agoMerge "Disable extracting the bg color from the window background." into nyc-dev
Winson Chung [Tue, 1 Mar 2016 19:07:34 +0000 (19:07 +0000)]
Merge "Disable extracting the bg color from the window background." into nyc-dev

8 years agoHide android.bluetooth.OobData
Jakub Pawlowski [Tue, 1 Mar 2016 03:31:59 +0000 (19:31 -0800)]
Hide android.bluetooth.OobData

Bug: 27385555
Change-Id: I1767909ca17b1b23a2f23ea4a5b4a02cc52eecde

8 years agoMerge "Created metric events for scoped directory access API." into nyc-dev
Felipe Leme [Tue, 1 Mar 2016 18:58:26 +0000 (18:58 +0000)]
Merge "Created metric events for scoped directory access API." into nyc-dev

8 years agoMerge "Adding toStrings() to the API." into nyc-dev
Santos Cordon [Tue, 1 Mar 2016 18:57:01 +0000 (18:57 +0000)]
Merge "Adding toStrings() to the API." into nyc-dev

8 years agoMerge "Protect against a lack of metadata." into nyc-dev
Julia Reynolds [Tue, 1 Mar 2016 18:56:15 +0000 (18:56 +0000)]
Merge "Protect against a lack of metadata." into nyc-dev

8 years agoMore sensible return code for Credentials.deleteAll
Robin Lee [Mon, 29 Feb 2016 17:43:54 +0000 (17:43 +0000)]
More sensible return code for Credentials.deleteAll

Was: result = True iff nDeleted != 0
Now: result = True iff nDeleted == nExisted

The most common reason you'd want to delete all credentials under an
alias is to be sure they no longer exist. The new contract gives a
way to do this without multiple IPCs to the same service.

Bug: 27335182
Change-Id: I8762b9b4fcc48037387dd805dbd0dbbe141d5b24

8 years agoMerge "Fix app icon in notification guts." into nyc-dev
Julia Reynolds [Tue, 1 Mar 2016 18:54:52 +0000 (18:54 +0000)]
Merge "Fix app icon in notification guts." into nyc-dev

8 years agoMerge "Frameworks/base: Refactor TextView initialization" into nyc-dev
Andreas Gampe [Tue, 1 Mar 2016 18:38:08 +0000 (18:38 +0000)]
Merge "Frameworks/base: Refactor TextView initialization" into nyc-dev

8 years agoMerge "make isUiModeLocked, isNightModeLocked test api" into nyc-dev
Keun-young Park [Tue, 1 Mar 2016 18:37:55 +0000 (18:37 +0000)]
Merge "make isUiModeLocked, isNightModeLocked test api" into nyc-dev

8 years agoCreated metric events for scoped directory access API.
Felipe Leme [Wed, 24 Feb 2016 18:17:41 +0000 (10:17 -0800)]
Created metric events for scoped directory access API.

BUG: 27334821
Change-Id: I8a1bfc328dcd26b42bb66884d14b34ad11aa232f

8 years agoMerge "Fix Fingerprint confusing personal and work fingerprints when unified" into...
Clara Bayarri [Tue, 1 Mar 2016 18:07:04 +0000 (18:07 +0000)]
Merge "Fix Fingerprint confusing personal and work fingerprints when unified" into nyc-dev

8 years agoSkip animation in error case, log for further investigation.
Winson [Tue, 1 Mar 2016 18:07:04 +0000 (10:07 -0800)]
Skip animation in error case, log for further investigation.

Bug: 27389156
Change-Id: Idc2ebdf04ab72d326f68a47627b27d6e61315d1e

8 years agoTIF: Address API review comments
Dongwon Kang [Tue, 1 Mar 2016 17:36:07 +0000 (09:36 -0800)]
TIF: Address API review comments

Bug: 27386052
Change-Id: I242819e0817723e247b8fe646d534899ab50af76

8 years agoMerge "Restrict the cases when we profile guided compile an apk" into nyc-dev
Calin Juravle [Tue, 1 Mar 2016 17:59:18 +0000 (17:59 +0000)]
Merge "Restrict the cases when we profile guided compile an apk" into nyc-dev

8 years agoMerge "Check task.isResizeable() instead of the resize mode directly" into nyc-dev
Chong Zhang [Tue, 1 Mar 2016 17:58:16 +0000 (17:58 +0000)]
Merge "Check task.isResizeable() instead of the resize mode directly" into nyc-dev

8 years agoMerge "Add setAlwaysOpaque and setTint to BarTransitions" into nyc-dev
Yorke Lee [Tue, 1 Mar 2016 17:50:31 +0000 (17:50 +0000)]
Merge "Add setAlwaysOpaque and setTint to BarTransitions" into nyc-dev

8 years agoMerge "Display Toast with linker warnings after Activity.onStart()" into nyc-dev
Dimitry Ivanov [Tue, 1 Mar 2016 17:50:00 +0000 (17:50 +0000)]
Merge "Display Toast with linker warnings after Activity.onStart()" into nyc-dev

8 years agoMerge "Fixed handling of blockUninstall setting" into nyc-dev
Fyodor Kupolov [Tue, 1 Mar 2016 17:39:12 +0000 (17:39 +0000)]
Merge "Fixed handling of blockUninstall setting" into nyc-dev

8 years agoProtect against a lack of metadata.
Julia Reynolds [Tue, 1 Mar 2016 17:33:48 +0000 (12:33 -0500)]
Protect against a lack of metadata.

Change-Id: Idc28ac451567e8ee4772d9db3009102d781e6331

8 years agoMerge "Correct state loss tracking for FragmentTransaction.commitNow" into nyc-dev
Adam Powell [Tue, 1 Mar 2016 17:33:39 +0000 (17:33 +0000)]
Merge "Correct state loss tracking for FragmentTransaction.commitNow" into nyc-dev

8 years agoFix app icon in notification guts.
Julia Reynolds [Tue, 1 Mar 2016 17:22:48 +0000 (12:22 -0500)]
Fix app icon in notification guts.

Bug: 27408961
Change-Id: Iafae86dff611eb5c00b283452b5fcbc65f314c9e

8 years agoTrack change 02072325e0133d78cc575732a0762ed3da0242a7
Przemyslaw Szczepaniak [Tue, 1 Mar 2016 17:03:02 +0000 (17:03 +0000)]
Track change 02072325e0133d78cc575732a0762ed3da0242a7

Bug: 27404545
Change-Id: I51b1e7239d456f0ec1d0bdc6b54761aeb44368d9

8 years agoMerge "Regenerate API after b8f53ee812b75b526c3b481b62334e45609fa70e." into nyc-dev
Narayan Kamath [Tue, 1 Mar 2016 17:21:51 +0000 (17:21 +0000)]
Merge "Regenerate API after b8f53ee812b75b526c3b481b62334e45609fa70e." into nyc-dev

8 years agoRegenerate API after b8f53ee812b75b526c3b481b62334e45609fa70e.
Narayan Kamath [Tue, 1 Mar 2016 17:18:58 +0000 (17:18 +0000)]
Regenerate API after b8f53ee812b75b526c3b481b62334e45609fa70e.

bug: 26704777
Change-Id: Ib448d90fdf0200d77df9cbb8930a904fbe3374ca

8 years agoMerge "Update Android mediamuxer documentation." into nyc-dev
Hangyu Kuang [Tue, 1 Mar 2016 17:18:14 +0000 (17:18 +0000)]
Merge "Update Android mediamuxer documentation." into nyc-dev

8 years agoMerge "Heed user shell restriction for pm calls" into nyc-dev
Amith Yamasani [Tue, 1 Mar 2016 17:10:26 +0000 (17:10 +0000)]
Merge "Heed user shell restriction for pm calls" into nyc-dev

8 years agoCorrect state loss tracking for FragmentTransaction.commitNow
Adam Powell [Tue, 1 Mar 2016 17:07:44 +0000 (09:07 -0800)]
Correct state loss tracking for FragmentTransaction.commitNow

Booleans are hard.

Bug 27419920

Change-Id: I91a746aa14cad36bf77ec6224ffc13b00dc39ae7

8 years agoMerge "AAPT2: Fix segfault when showing error in 9-patch" into nyc-dev
Adam Lesinski [Tue, 1 Mar 2016 17:07:13 +0000 (17:07 +0000)]
Merge "AAPT2: Fix segfault when showing error in 9-patch" into nyc-dev

8 years agoAAPT2: Fix segfault when showing error in 9-patch
Adam Lesinski [Tue, 1 Mar 2016 17:05:11 +0000 (09:05 -0800)]
AAPT2: Fix segfault when showing error in 9-patch

Change-Id: I8f457212efc27480758a7157455d98b5e316f772

8 years agoMerge "media: define HEVCProfileMain10HDR10" into nyc-dev
Ronghua Wu [Tue, 1 Mar 2016 16:35:20 +0000 (16:35 +0000)]
Merge "media: define HEVCProfileMain10HDR10" into nyc-dev

8 years agoHandle density changes in QS
Jason Monk [Thu, 25 Feb 2016 19:59:20 +0000 (14:59 -0500)]
Handle density changes in QS

Bug: 26845796
Change-Id: Icc783c9d706382e553df49f699aaf44aac943d18

8 years agoMerge "Adding SecurityException information to all device logging DPM public methods...
Michal Karpinski [Tue, 1 Mar 2016 15:57:43 +0000 (15:57 +0000)]
Merge "Adding SecurityException information to all device logging DPM public methods" into nyc-dev

8 years agoFix animation bug in chooser activity
Jorim Jaggi [Mon, 29 Feb 2016 13:54:22 +0000 (14:54 +0100)]
Fix animation bug in chooser activity

Make sure to set the status color to 0 (fully translucent), so
there is no ugly line travelling across the screen when opening
the activity.

Bug: 27285627
Change-Id: If8aa1059958f3e2a45a48f6ba276560244f284cd

8 years agoAdd activity onStop lifecycle to event logs.
Wale Ogunwale [Sun, 28 Feb 2016 01:37:46 +0000 (17:37 -0800)]
Add activity onStop lifecycle to event logs.

Also added reasons why onPause and onResume are called.

Bug: 27384433
Change-Id: If6c304f577b601511f6d9b948061d2cfa0dcb970

8 years agoAdding SecurityException information to all device logging DPM public methods
Michal Karpinski [Tue, 1 Mar 2016 14:55:10 +0000 (14:55 +0000)]
Adding SecurityException information to all device logging DPM public methods

Bug: 22860162
Change-Id: I6cdfad2dcdf14896c855debef34964def190e110

8 years agoRevert "Revert "Remove deprecated methods / classes""
Todd Kennedy [Wed, 24 Feb 2016 22:46:00 +0000 (22:46 +0000)]
Revert "Revert "Remove deprecated methods / classes""

This reverts commit 5cbeb5902633646fbc0a1be252081e77aaaee7b4.

Change-Id: Id96010364d65e6131221ebbcc8ce5889a2da256c

8 years agoMerge "Api review: AutomaticZenRule" into nyc-dev
Julia Reynolds [Tue, 1 Mar 2016 15:05:33 +0000 (15:05 +0000)]
Merge "Api review: AutomaticZenRule" into nyc-dev

8 years agoFix QS icon animations once and for all
Jason Monk [Tue, 1 Mar 2016 14:39:30 +0000 (09:39 -0500)]
Fix QS icon animations once and for all

Bug: 27250295
Change-Id: I6449b9cea19acf120dfc02d146fe608da46fe790

8 years agoMerge "Fix crash in isChildDocument when parent is in zip, and child not." into nyc-dev
Tomasz Mikolajewski [Tue, 1 Mar 2016 10:25:29 +0000 (10:25 +0000)]
Merge "Fix crash in isChildDocument when parent is in zip, and child not." into nyc-dev

8 years agoFix crash in isChildDocument when parent is in zip, and child not.
Tomasz Mikolajewski [Tue, 1 Mar 2016 01:36:10 +0000 (10:36 +0900)]
Fix crash in isChildDocument when parent is in zip, and child not.

There is no regular file representation for archive documents, so
the call to getFileForDocId(archivedDocId) was throwing an exception.

Bug: 27383423
Change-Id: Icbc1e8ecdddc7698cfdb79b41da6e1d3cecf11ae

8 years agoFix popup window calculation for multi-window
Jorim Jaggi [Mon, 29 Feb 2016 13:41:09 +0000 (14:41 +0100)]
Fix popup window calculation for multi-window

If ignoreBottomDecorations=true, the display size was extracted from
the resources. However, this didn't work if the parent window was in
multi-window, as all the calculations went wrong. Instead, introduce
View.getWindowDisplayFrame which returns the "full" frame of the task
the window is currently in, without any insets, and use that to
calculate the bottom edge.

Bug: 26255254
Change-Id: I8b235b335775022ae399ee082d1200aa76cc047c

8 years agoMerge "Fix argument type in MtpDatabase#getObjectPropertyValue." into nyc-dev
Daichi Hirono [Tue, 1 Mar 2016 08:36:27 +0000 (08:36 +0000)]
Merge "Fix argument type in MtpDatabase#getObjectPropertyValue." into nyc-dev

8 years agoMerge "Fix RootScanner to execute scan at least once before cancelling it." into...
Daichi Hirono [Tue, 1 Mar 2016 07:50:17 +0000 (07:50 +0000)]
Merge "Fix RootScanner to execute scan at least once before cancelling it." into nyc-dev

8 years agoFix argument type in MtpDatabase#getObjectPropertyValue.
Daichi Hirono [Mon, 29 Feb 2016 08:28:47 +0000 (17:28 +0900)]
Fix argument type in MtpDatabase#getObjectPropertyValue.

In MTP code, we use jint for ID (e.g. object handle) and code (property
code). But getObjectPropertyValue takes jlong and it causes missing
property values in Java code. Previously we passed the long value to
Map<Integer, MtpPropertyGroup>#get(Integer) and the compiler somehow
accepted the code. However it actually takes Long at runtime, so the
properties are never found.

BUG=26437284
Change-Id: I79defd325ea5d20c4dce84d891d984e24abcacc5

8 years agoAdd constructor with more inputs for dependency injection.
Erik Kline [Tue, 1 Mar 2016 06:10:40 +0000 (06:10 +0000)]
Add constructor with more inputs for dependency injection.
am: b9df11099f

* commit 'b9df11099f16ca816a69e06f1327eb1f86723578':
  Add constructor with more inputs for dependency injection.

8 years agoAdd constructor with more inputs for dependency injection.
Erik Kline [Tue, 1 Mar 2016 01:37:50 +0000 (10:37 +0900)]
Add constructor with more inputs for dependency injection.

Bug: 26991160
Bug: 27406552
Change-Id: If4a0a2f1afb1da4ad59df9eb31c540047c84659b

8 years agoFix RootScanner to execute scan at least once before cancelling it.
Daichi Hirono [Fri, 26 Feb 2016 08:41:45 +0000 (17:41 +0900)]
Fix RootScanner to execute scan at least once before cancelling it.

Previously RootScanner is implemented by FutureTask, and if it is
cancelled before it starts running in background thread, the scan will
be never executed.

The CL stops using FutureTask and introduces CountDownLatch to control
UpdateRootsRunnable.

BUG=27369585

Change-Id: Ica8799faba0a8e5ca91a6b8be36dc4f5118d6333

8 years agoAdd setAlwaysOpaque and setTint to BarTransitions
Yorke Lee [Fri, 26 Feb 2016 01:58:33 +0000 (17:58 -0800)]
Add setAlwaysOpaque and setTint to BarTransitions

Allow the opacity and color of the NavigationBarView
to be controlled.

Bug: 26425669

Change-Id: I364f183bf0ef90c446ae68987ccc3b6bbf09aa67

8 years agoMerge "Add javadocs to MediaCodec.CryptoInfo methods" into nyc-dev
Jeff Tinker [Tue, 1 Mar 2016 02:26:29 +0000 (02:26 +0000)]
Merge "Add javadocs to MediaCodec.CryptoInfo methods" into nyc-dev

8 years agoMerge "Fix settings icon row consuming the click when tapping the notification" into...
Mady Mellor [Tue, 1 Mar 2016 02:18:32 +0000 (02:18 +0000)]
Merge "Fix settings icon row consuming the click when tapping the notification" into nyc-dev

8 years agoCheck task.isResizeable() instead of the resize mode directly
Chong Zhang [Tue, 1 Mar 2016 02:09:17 +0000 (18:09 -0800)]
Check task.isResizeable() instead of the resize mode directly

The resize mode doesn't take into account developer settings override.

Bug: 27390258
Change-Id: Id161ceb4f143f982f6bec3f915655bb66949ddd3

8 years agoFix issue #27317952: PendingIntent.getIntent() should be protected
Dianne Hackborn [Tue, 1 Mar 2016 02:02:43 +0000 (18:02 -0800)]
Fix issue #27317952: PendingIntent.getIntent() should be protected

Change-Id: Ib05135cd94f5251942a6fc6df542ed39083f7827

8 years agoFix Fingerprint confusing personal and work fingerprints when unified
Clara Bayarri [Tue, 1 Mar 2016 01:49:18 +0000 (17:49 -0800)]
Fix Fingerprint confusing personal and work fingerprints when unified

When the personal and work profile have unified locks, FingerprintService
was retrieving the credential owner and returning the personal data
even when explicitely asked for the work profile.
Bug: 27408217

Change-Id: I67d20f92e0016e4ccd38f8b19edebc543830df4a

8 years agoFixed handling of blockUninstall setting
Fyodor Kupolov [Fri, 19 Feb 2016 02:30:43 +0000 (18:30 -0800)]
Fixed handling of blockUninstall setting

Previously, if one user has blockUninstall, it will block uninstalling
the package for all users. Now the package is uninstalled for all users,
excluding the ones that have blockUninstall setting.

Bug: 24616123
Change-Id: Ie4a68ef97fbef4711b18ccd311e39f32ab4b8efe

8 years agoMerge "Proper grant default permissions to default SMS and Phone" into nyc-dev
Svetoslav Ganov [Tue, 1 Mar 2016 01:40:36 +0000 (01:40 +0000)]
Merge "Proper grant default permissions to default SMS and Phone" into nyc-dev

8 years agoMerge "Remove revealLauncher and revealApp from tests." into nyc-dev
Tomasz Mikolajewski [Tue, 1 Mar 2016 01:38:51 +0000 (01:38 +0000)]
Merge "Remove revealLauncher and revealApp from tests." into nyc-dev

8 years agoHeed user shell restriction for pm calls
Amith Yamasani [Tue, 1 Mar 2016 00:19:01 +0000 (16:19 -0800)]
Heed user shell restriction for pm calls

Make sure that a restricted user cannot use adb shell commands
to grant/revoke runtime permissions.

Bug: 27418014
Change-Id: I518b09f56ca7d77cc2bfa1d0b4faaf129e19000d

8 years agoProper grant default permissions to default SMS and Phone
Svetoslav Ganov [Tue, 1 Mar 2016 01:29:39 +0000 (17:29 -0800)]
Proper grant default permissions to default SMS and Phone

We grant default permissions to the default SMS and
Phone apps when they are selected as such to ensure
they can do their job. We don't grant default permissions
to apps if the version on the system image does not
declare them. This is correct for default grants on
first boot or a new user creation. This is a problem
for default Phone and SMS as we want to grant them
the permission as a result of a deliberate user action
and therefore should not care if the version on the
system image declares the permission.

As a result if an SMS app that ships as a stub to reduce
image size is later updated to the full version and
made the default SMS it would not get the default grants
while an installed third-party app that did not ship
on the system image would get the grants.

This change ensures the default SMS and Phone get
their default grants regardless whether the verion on
the system image declares the permissions.

bug:25288760

Change-Id: I2fecf5cbce4ebabb145a3f29abb555bcb65d54d6

8 years agoMerge "Allow system to bypass DISALLOW_SHARE_LOCATION restriction" into nyc-dev
Fyodor Kupolov [Tue, 1 Mar 2016 01:21:58 +0000 (01:21 +0000)]
Merge "Allow system to bypass DISALLOW_SHARE_LOCATION restriction" into nyc-dev

8 years agoMerge "Unlock Keystore/Keymaster separately for Work Challenge" into nyc-dev
Clara Bayarri [Tue, 1 Mar 2016 01:08:37 +0000 (01:08 +0000)]
Merge "Unlock Keystore/Keymaster separately for Work Challenge" into nyc-dev

8 years agoMerge "Make bugreport details dialog confirm to Material Guidelines for Dialogs....
Felipe Leme [Tue, 1 Mar 2016 00:56:34 +0000 (00:56 +0000)]
Merge "Make bugreport details dialog confirm to Material Guidelines for Dialogs." into nyc-dev

8 years agoMerge "Explicitly check for updated system apps" into nyc-dev
Dimitry Ivanov [Tue, 1 Mar 2016 00:51:37 +0000 (00:51 +0000)]
Merge "Explicitly check for updated system apps" into nyc-dev

8 years agoMake bugreport details dialog confirm to Material Guidelines for Dialogs.
Felipe Leme [Sat, 27 Feb 2016 00:48:22 +0000 (16:48 -0800)]
Make bugreport details dialog confirm to Material Guidelines for Dialogs.

Changes:
- Removed hints.
- Added TextViews for field labels.
- Added padding for inner dialog
- Adedd autoCorrect and capSentences to title and summary
- Changed strings.
- Set name to be selectAllOnFocus initially.

Also improved some logging statements.

BUG: 26324085
Change-Id: I32597a7c2839ca706dbbcf13660e976469ab8dd0

8 years agoMerge "media: switch to using MediaImage2" into nyc-dev
Lajos Molnar [Tue, 1 Mar 2016 00:40:28 +0000 (00:40 +0000)]
Merge "media: switch to using MediaImage2" into nyc-dev

8 years agoMerge "Fix issue #27385109: control activity behavior without triggering..." into...
Dianne Hackborn [Tue, 1 Mar 2016 00:35:36 +0000 (00:35 +0000)]
Merge "Fix issue #27385109: control activity behavior without triggering..." into nyc-dev

8 years agoAdd deprecated annotation to launchManageBlockedNumbersActivity API.
Abhijith Shastry [Tue, 1 Mar 2016 00:29:39 +0000 (16:29 -0800)]
Add deprecated annotation to launchManageBlockedNumbersActivity API.

BUG: 27364137
Change-Id: I0c5c05042e6bc05a605613bde7ba3c579c1858ed

8 years agoFixed a bug where group expansion size calculation was wrong
Selim Cinek [Tue, 1 Mar 2016 00:14:25 +0000 (16:14 -0800)]
Fixed a bug where group expansion size calculation was wrong

On the lockscreen, the minheight was always based on the intrinsic
height and not actually the minHeight of the children. Because
children were userlocked, they were now reporting their small size
instead of the single line size.
This meant that the expand motion on the lockscreen wasn't following
the finger at all.

Bug: 27418617
Change-Id: I81daaf87887de1adc014cb4c6d46f4ef118061e5