OSDN Git Service

android-x86/frameworks-base.git
8 years agoFixing issue with persistent screenshot notification
Winson [Thu, 18 Feb 2016 21:45:54 +0000 (13:45 -0800)]
Fixing issue with persistent screenshot notification

- Ensure that we dismiss notifications when cancelled
- Removing unnecessary notification id and cancel extra
- Fixing the strings when capturing a screenshot fails

Bug: 27149651
Bug: 27177097
Change-Id: Ie2ea4318309fff4041acb04833216fdd5cf8838a

8 years agoUpdating task description when activity is visible.
Winson [Tue, 23 Feb 2016 21:32:09 +0000 (13:32 -0800)]
Updating task description when activity is visible.

Bug: 27275448
Change-Id: If92221d30c84c58b5d36db1b254d264a0ff3ec25

8 years agoMerge "Aggressively unbind GL_PIXEL_UNPACK_BUFFER" into nyc-dev
John Reck [Thu, 25 Feb 2016 00:14:23 +0000 (00:14 +0000)]
Merge "Aggressively unbind GL_PIXEL_UNPACK_BUFFER" into nyc-dev

8 years agoMerge "Disallow downgrading of non-debuggable packages." into nyc-dev
Alex Klyubin [Thu, 25 Feb 2016 00:05:35 +0000 (00:05 +0000)]
Merge "Disallow downgrading of non-debuggable packages." into nyc-dev

8 years agoMerge "Dont trust the user added CA store by default for apps targeting N" into nyc-dev
Chad Brubaker [Thu, 25 Feb 2016 00:02:35 +0000 (00:02 +0000)]
Merge "Dont trust the user added CA store by default for apps targeting N" into nyc-dev

8 years agoMerge "Settings: add ENCODED_SURROUND_OUTPUT" into nyc-dev
Phil Burk [Wed, 24 Feb 2016 23:49:17 +0000 (23:49 +0000)]
Merge "Settings: add ENCODED_SURROUND_OUTPUT" into nyc-dev

8 years agoMerge "Grant permissions for EmergencyInfo app" into nyc-dev
Maria Garcia Puyol [Wed, 24 Feb 2016 23:44:04 +0000 (23:44 +0000)]
Merge "Grant permissions for EmergencyInfo app" into nyc-dev

8 years agoAggressively unbind GL_PIXEL_UNPACK_BUFFER
John Reck [Wed, 24 Feb 2016 23:36:35 +0000 (15:36 -0800)]
Aggressively unbind GL_PIXEL_UNPACK_BUFFER

Bug: 27186019

Theory: It appears to be possible for FontRenderer
to not unbind its PBO prior to textures being uploaded,
resulting in trying to glSubTexImage2D with a bound
GL_PIXEL_UNPACK_BUFFER. In that scenario the void* is
the offset into the PBO which given a non-null data
will almost certainly overrun the end of the buffer. This
in turn produces a GL_INVALID_OPERATION error.

Change PixelBuffer to avoid leaking this state for now.
This will result in more calls to glBindBuffer/glUnbindBuffer
in the worst case, but the worst case is already bad so this
shouldn't be a problem. In the normal case we avoid binding
the PBO at all ever, so this doesn't impact that.

Change-Id: I05473f0d2f9a3a5da0e33d8f9ddea4731ce970e3

8 years agoMerge "Fix exit transition and dismiss callback for popup exit transition" into nyc-dev
Alan Viverette [Wed, 24 Feb 2016 23:22:19 +0000 (23:22 +0000)]
Merge "Fix exit transition and dismiss callback for popup exit transition" into nyc-dev

8 years agoMerge "Fix the title of the language selection list" into nyc-dev
Mihai Niță [Wed, 24 Feb 2016 23:22:03 +0000 (23:22 +0000)]
Merge "Fix the title of the language selection list" into nyc-dev

8 years agoMerge "Fix AlwaysOnHotwordDetector recognition event bug." into nyc-dev
Arunesh Mishra [Wed, 24 Feb 2016 23:12:11 +0000 (23:12 +0000)]
Merge "Fix AlwaysOnHotwordDetector recognition event bug." into nyc-dev

8 years agoMerge "Protect FragmentManager against View.NO_ID container ids" into nyc-dev
Adam Powell [Wed, 24 Feb 2016 23:01:32 +0000 (23:01 +0000)]
Merge "Protect FragmentManager against View.NO_ID container ids" into nyc-dev

8 years agoFix the title of the language selection list
Mihai Nita [Wed, 24 Feb 2016 22:57:25 +0000 (14:57 -0800)]
Fix the title of the language selection list

Changed to "Add a language" (consistent with "Add an account")

Bug: 27148570
Change-Id: I4d48c83ac59884f7d568f93f83fd9ea4799c60ad

8 years agoMerge "Revert "Remove deprecated methods / classes"" into nyc-dev
Todd Kennedy [Wed, 24 Feb 2016 22:45:48 +0000 (22:45 +0000)]
Merge "Revert "Remove deprecated methods / classes"" into nyc-dev

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

This reverts commit 9706c01f9b92cee64bb84782138735225c8588e0.

Change-Id: I14c53ab140220e48f6728b1173ea58760bbeb7f9

8 years agoDisallow downgrading of non-debuggable packages.
Alex Klyubin [Wed, 24 Feb 2016 21:21:41 +0000 (13:21 -0800)]
Disallow downgrading of non-debuggable packages.

An attacker could downgrade a package to an older version with known
security vulnerabilities and then use some of the vulnerabilities to
access the application's data. This would constitute a bypass of
Android Application Sandbox. Thus, downgrading while keeping
application data is no longer permitted.

To help developers debug their apps, packages marked as debuggable can
still be downgraded while keeping their data. This does not put the
installed base at risk because, as a security measure, most
application stores reject packages marked as debuggable.

To downgrade a non-debuggable (i.e., release) package, uninstall the
package (thus wiping its data), then install the older version of the
package.

Bug: 27327503
Change-Id: Iac75ed3c3831b5d925dfd8b660527cfa95813da8

8 years agoMerge "QS Tweaks" into nyc-dev
Jason Monk [Wed, 24 Feb 2016 22:30:37 +0000 (22:30 +0000)]
Merge "QS Tweaks" into nyc-dev

8 years agoQS Tweaks
Jason Monk [Wed, 24 Feb 2016 22:25:49 +0000 (17:25 -0500)]
QS Tweaks

 - Bring back toolbar, save on close, reset -> overflow
 - Fix drag on touch
 - Fix battery icon size
 - Verify correct permission to display QS tile

Bug: 27327479
Bug: 27250519
Bug: 27341503
Change-Id: I8984e441222e004f7ddd4b280b0c154bda2cc742

8 years agoMerge "Support safe mode properly." into nyc-dev
Makoto Onuki [Wed, 24 Feb 2016 22:20:06 +0000 (22:20 +0000)]
Merge "Support safe mode properly." into nyc-dev

8 years agoMerge "Update data for emoji modifier bases to Unicode 9" into nyc-dev
Raph Levien [Wed, 24 Feb 2016 22:00:58 +0000 (22:00 +0000)]
Merge "Update data for emoji modifier bases to Unicode 9" into nyc-dev

8 years agoMerge "Type-to-focus improvements." into nyc-dev
Ben Kwa [Wed, 24 Feb 2016 21:55:42 +0000 (21:55 +0000)]
Merge "Type-to-focus improvements." into nyc-dev

8 years agoMerge "Fix a crash when browsing empty roots." into nyc-dev
Ben Kwa [Wed, 24 Feb 2016 21:52:47 +0000 (21:52 +0000)]
Merge "Fix a crash when browsing empty roots." into nyc-dev

8 years agoMerge "Make sure tuner has metrics coverage for new stuff" into nyc-dev
Jason Monk [Wed, 24 Feb 2016 21:52:13 +0000 (21:52 +0000)]
Merge "Make sure tuner has metrics coverage for new stuff" into nyc-dev

8 years agoMerge "TIF: Add null-checking in Programs.Genres.encode/decode" into nyc-dev
Dongwon Kang [Wed, 24 Feb 2016 21:51:21 +0000 (21:51 +0000)]
Merge "TIF: Add null-checking in Programs.Genres.encode/decode" into nyc-dev

8 years agoType-to-focus improvements.
Ben Kwa [Wed, 24 Feb 2016 07:00:01 +0000 (23:00 -0800)]
Type-to-focus improvements.

- Fix handling of tab and backspace keys while in type-to-search mode.
- Fix search term highlighting on directory items in grid view.
- Switch to a time-based search model.  Typing starts a search.  The
  current search expires if no keys are pressed for 500 ms.
- Make type-to-focus case-insensitive.

BUG=27336167
BUG=27324974

Change-Id: I92633222c9a04af24729501c48885eabebf00696

8 years agoMerge "PIP: Add RTL support" into nyc-dev
Jaewan Kim [Wed, 24 Feb 2016 21:39:44 +0000 (21:39 +0000)]
Merge "PIP: Add RTL support" into nyc-dev

8 years agoPIP: Add RTL support
Jaewan Kim [Wed, 24 Feb 2016 20:40:35 +0000 (12:40 -0800)]
PIP: Add RTL support

This also matches the PIP size with the UX redline.

Bug: 27108444
Change-Id: I786b9633e753cb26852095ff91674b2f44f30a3d

8 years agoMerge "NPE fix for JobScheduler" into nyc-dev
Matthew Williams [Wed, 24 Feb 2016 21:37:44 +0000 (21:37 +0000)]
Merge "NPE fix for JobScheduler" into nyc-dev

8 years agoMerge "Don't restore stack when picking copy destination." into nyc-dev
Steve McKay [Wed, 24 Feb 2016 21:32:37 +0000 (21:32 +0000)]
Merge "Don't restore stack when picking copy destination." into nyc-dev

8 years agoNPE fix for JobScheduler
Shreyas Basarge [Mon, 22 Feb 2016 22:29:39 +0000 (22:29 +0000)]
NPE fix for JobScheduler

Add a null check before setting stop
reason for job parameters.

Bug: 27166522
Change-Id: I8b829c0cf8df7da0b8118ab75779f209d0af1b22

8 years agoDon't restore stack when picking copy destination.
Steve McKay [Tue, 23 Feb 2016 22:34:50 +0000 (14:34 -0800)]
Don't restore stack when picking copy destination.

Move fancy drawer "fiddling" to FilesActivity.
Rename the various "Restore" tasks to better reflect their roles.

Change-Id: I7f5c3dee11112bf0a31e6219d09c572c5651629d

8 years agoMake sure tuner has metrics coverage for new stuff
Jason Monk [Wed, 24 Feb 2016 21:24:55 +0000 (16:24 -0500)]
Make sure tuner has metrics coverage for new stuff

Change-Id: I1e0d8e34f518cb3fc2bd9ccff0b71dc586ed2ab6

8 years agoSettings: add ENCODED_SURROUND_OUTPUT
Phil Burk [Wed, 24 Feb 2016 01:12:04 +0000 (17:12 -0800)]
Settings: add ENCODED_SURROUND_OUTPUT

Support AUTO, ALWAYS or NEVER preference for using AC3 and DTS.

Bug: 24541671
Change-Id: I423969882d18d99ce93bea57d10bdb1da7063b7a
Signed-off-by: Phil Burk <philburk@google.com>
8 years agoMerge "Adding missing break statements causing crash on MSG_SET_EXTRAS." into nyc-dev
Tyler Gunn [Wed, 24 Feb 2016 21:23:16 +0000 (21:23 +0000)]
Merge "Adding missing break statements causing crash on MSG_SET_EXTRAS." into nyc-dev

8 years agoMerge "ImageReader: skip callback when image reader is being closed" into nyc-dev
Zhijun He [Wed, 24 Feb 2016 21:17:50 +0000 (21:17 +0000)]
Merge "ImageReader: skip callback when image reader is being closed" into nyc-dev

8 years agoAdding missing break statements causing crash on MSG_SET_EXTRAS.
Tyler Gunn [Wed, 24 Feb 2016 21:17:21 +0000 (13:17 -0800)]
Adding missing break statements causing crash on MSG_SET_EXTRAS.

The case block for MSG_SET_EXTRAS was missing its break statement, all
the way back to summer 2015 when that code was originally added.

When the new MSG_ON_CONNECTION_EVENT handler was added, it introduced a
new potential fall-through from MSG_SET_EXTRAS (in addition to the fact it
too was missing a break statement).

Bug: 27338441
Change-Id: I2df2bc78c4ceb32e6245888eed18c2d8834e629b

8 years agoMerge "Temporary fix for QXDM crashes." into nyc-dev
Jeff Sharkey [Wed, 24 Feb 2016 21:16:33 +0000 (21:16 +0000)]
Merge "Temporary fix for QXDM crashes." into nyc-dev

8 years agoTemporary fix for QXDM crashes.
Jeff Sharkey [Wed, 24 Feb 2016 21:15:03 +0000 (14:15 -0700)]
Temporary fix for QXDM crashes.

Bug: 26971038
Change-Id: I59efbdec11ca8d9a0b640c092402091d66b220a0

8 years agoSupport safe mode properly.
Makoto Onuki [Tue, 16 Feb 2016 23:20:30 +0000 (15:20 -0800)]
Support safe mode properly.

In safe mode, IPM.queryXxx() doesn't work.  Use IPM.getReceiverInfo()
directly instead.

Bug 27108276

Change-Id: Ice8f882559b8f0596a19ddb3a16395a4dc538a25

8 years agoMerge "Fix personal apps are not shown when tapping "personal" in activity chooser...
Tony Mak [Wed, 24 Feb 2016 21:11:29 +0000 (21:11 +0000)]
Merge "Fix personal apps are not shown when tapping "personal" in activity chooser" into nyc-dev

8 years agoUpdate data for emoji modifier bases to Unicode 9
Raph Levien [Wed, 24 Feb 2016 20:58:22 +0000 (12:58 -0800)]
Update data for emoji modifier bases to Unicode 9

This patch updates the set of emoji modifier bases to Unicode 9,
using data from:
http://www.unicode.org/Public/emoji/3.0/emoji-data.txt

Bug: 27039487
Change-Id: I94c09113753c0595e72f403ba01b3e7fa78c5627

8 years agoMerge "Remove deprecated methods / classes" into nyc-dev
Todd Kennedy [Wed, 24 Feb 2016 21:02:56 +0000 (21:02 +0000)]
Merge "Remove deprecated methods / classes" into nyc-dev

8 years agoTIF: Add null-checking in Programs.Genres.encode/decode
Dongwon Kang [Tue, 23 Feb 2016 21:45:25 +0000 (13:45 -0800)]
TIF: Add null-checking in Programs.Genres.encode/decode

Bug: 27292029
Change-Id: I041a5242f9e5fef9c5c7f89e3d5d597a6063ed4c

8 years agoMerge "Only ellipsize at end of strings." into nyc-dev
Steve McKay [Wed, 24 Feb 2016 21:01:07 +0000 (21:01 +0000)]
Merge "Only ellipsize at end of strings." into nyc-dev

8 years agoOnly ellipsize at end of strings.
Steve McKay [Wed, 24 Feb 2016 20:57:06 +0000 (12:57 -0800)]
Only ellipsize at end of strings.

Bug: 2733948427338617
Change-Id: I5e908c862cf9d6a2ba0c7552434914f18fbab716

8 years agoFix AlwaysOnHotwordDetector recognition event bug.
Arunesh Mishra [Fri, 19 Feb 2016 00:16:12 +0000 (16:16 -0800)]
Fix AlwaysOnHotwordDetector recognition event bug.

Parcelables don't work well with inheritance. So changed the
IRecognitionStatusCallback to have onKeyphraseDetected() and
onGenericSoundTriggerDetected() for those respective events.

Made corresponding changes to AlwaysOnHotwordDetector and SoundTriggerDetector.

Bug: 27250528
Change-Id: Ic08a431e7cc4248c688b05c865348170246de576

8 years agoMerge "Disable per-app scheduled job limits" into nyc-dev
Chris Tate [Wed, 24 Feb 2016 20:45:17 +0000 (20:45 +0000)]
Merge "Disable per-app scheduled job limits" into nyc-dev

8 years agoUse correct task bounds when moved from fullscreen to freeform stack
Wale Ogunwale [Tue, 23 Feb 2016 20:20:08 +0000 (12:20 -0800)]
Use correct task bounds when moved from fullscreen to freeform stack

When we are moving a task to the freeform stack, get the launch bounds
to use or layout in stack vs. using the existing bounds that can be
null.

Also, prevent moving a task to the freeform stack if freeform isn't supported.

Bug: 27157914
Change-Id: I0d86baa6141961b92a436107b5c5bb1316570558

8 years agoAdd support for showing wallpaper for the user selected in UI.
Vadim Tryshev [Fri, 12 Feb 2016 23:39:28 +0000 (15:39 -0800)]
Add support for showing wallpaper for the user selected in UI.

This change will go nyc-dev.

There will be another change in the UI, which will go to our
branch.

Bug: 25185253
Change-Id: I6feac9fa4190b28a8599a18367bea8c6a5a83b9a

8 years agoFix exit transition and dismiss callback for popup exit transition
Alan Viverette [Wed, 24 Feb 2016 20:34:11 +0000 (15:34 -0500)]
Fix exit transition and dismiss callback for popup exit transition

We should run the transition only when the anchor root IS attached,
and we should only call the dismiss callback when the animation has
completed and the window has been removed.

Bug: 25323707
Bug: 26647820
Change-Id: I2bcdc901885d4c0a6c48c2b2c949797def1d7512

8 years agoDisable per-app scheduled job limits
Christopher Tate [Wed, 24 Feb 2016 20:30:22 +0000 (12:30 -0800)]
Disable per-app scheduled job limits

Bug 27335118

Change-Id: I6ec92498c1e90e63a650db2a676cfd75dd91aced

8 years agoFix personal apps are not shown when tapping "personal" in activity chooser
Tony Mak [Wed, 24 Feb 2016 20:26:24 +0000 (20:26 +0000)]
Fix personal apps are not shown when tapping "personal" in activity chooser

It is introduced in ag/842541.
function isMatch return flage when Flag that are neither
MATCH_ENCRYPTION_AWARE and MATCH_ENCRYPTION_UNAWARE.

We should call updateFlagsForResolve before resolving any intent in order
to make sure the flag is set properly.

Bug: 26614039
Change-Id: I4da34a34cb515557d0f5948a4c9ec4da9bfeb3f4

8 years agoMerge "QS Animation tweaks" into nyc-dev
Jason Monk [Wed, 24 Feb 2016 20:24:11 +0000 (20:24 +0000)]
Merge "QS Animation tweaks" into nyc-dev

8 years agoresolve merge conflicts of e6c7c8e8f2 to cw-e-dev am: dfd4b8b25c
Andre Eisenbach [Wed, 24 Feb 2016 20:22:09 +0000 (20:22 +0000)]
resolve merge conflicts of e6c7c8e8f2 to cw-e-dev am: dfd4b8b25c
am: 1cba33abf3

* commit '1cba33abf35159928e065ca933dfbe67189215a7':
  DO NOT MERGE Read Bluetooth interop database entries from settings (1/2)

8 years agoMerge "Fix broken remote inputs" into nyc-dev
Adrian Roos [Wed, 24 Feb 2016 20:20:12 +0000 (20:20 +0000)]
Merge "Fix broken remote inputs" into nyc-dev

8 years agoMerge "Set input type on RemoteInputView" into nyc-dev
Adrian Roos [Wed, 24 Feb 2016 20:11:43 +0000 (20:11 +0000)]
Merge "Set input type on RemoteInputView" into nyc-dev

8 years agoFix broken remote inputs
Adrian Roos [Wed, 24 Feb 2016 20:05:51 +0000 (12:05 -0800)]
Fix broken remote inputs

Bug: 22452379
Change-Id: Ibcf0cf23e9f163b37270d42629de01083e12643c

8 years agoMerge "Adding Error Codes for IWLAN/EPDG Connection" into mm-wireless-dev
Nathan Harold [Wed, 24 Feb 2016 20:02:09 +0000 (20:02 +0000)]
Merge "Adding Error Codes for IWLAN/EPDG Connection" into mm-wireless-dev
am: 17469433e3

* commit '17469433e35e5a137ff37cb3a5fdead76574c146':
  Adding Error Codes for IWLAN/EPDG Connection

8 years agoresolve merge conflicts of e6c7c8e8f2 to cw-e-dev
Andre Eisenbach [Wed, 24 Feb 2016 19:57:07 +0000 (19:57 +0000)]
resolve merge conflicts of e6c7c8e8f2 to cw-e-dev
am: dfd4b8b25c

* commit 'dfd4b8b25c6454dec6d1bdc7cae4976b537fff2f':
  DO NOT MERGE Read Bluetooth interop database entries from settings (1/2)

8 years agoMerge "Adding Error Codes for IWLAN/EPDG Connection" into mm-wireless-dev
Nathan Harold [Wed, 24 Feb 2016 19:55:52 +0000 (19:55 +0000)]
Merge "Adding Error Codes for IWLAN/EPDG Connection" into mm-wireless-dev

8 years agoQS Animation tweaks
Jason Monk [Wed, 24 Feb 2016 19:53:57 +0000 (14:53 -0500)]
QS Animation tweaks

Try to do less work and animate less things, while keeping the same
animation overall.

Bug: 27278616
Change-Id: I26b6658fd64c74a70e9eae9e00de5f7b0927abb2

8 years agoMerge "Optimize calls to TelephonyManager to check for privileged apps" into nyc-dev
Amith Yamasani [Wed, 24 Feb 2016 19:42:10 +0000 (19:42 +0000)]
Merge "Optimize calls to TelephonyManager to check for privileged apps" into nyc-dev

8 years agoMerge "Fix NPE when null BackupObserver is passed into BackupManager#requestBackup...
Sergey Poromov [Wed, 24 Feb 2016 19:40:51 +0000 (19:40 +0000)]
Merge "Fix NPE when null BackupObserver is passed into BackupManager#requestBackup()" into nyc-dev

8 years agoresolve merge conflicts of e6c7c8e8f2 to cw-e-dev
Andre Eisenbach [Wed, 24 Feb 2016 19:36:27 +0000 (11:36 -0800)]
resolve merge conflicts of e6c7c8e8f2 to cw-e-dev

Change-Id: I94683e571a73df721206d7e5fc14cb817ec9620f

8 years agoOptimize calls to TelephonyManager to check for privileged apps
Amith Yamasani [Fri, 19 Feb 2016 20:55:27 +0000 (12:55 -0800)]
Optimize calls to TelephonyManager to check for privileged apps

Calling into TelephonyManager each of hundreds of apps to check
if the app is carrier privileged was very expensive, especially
when there aren't even any carrier access rules specified. This
change fetches all the carrier privileged apps in one call,
reducing the number of IPC calls to the radio process and checks
the package names locally.

If the carrier rules change or packages are modified, the list
will be computed and fetched again.

Other optimizations in Telephony help speed up the individual calls
to check if a package is privileged, as well.

Bug: 27271861
Change-Id: I5a77b6da4f2cdc603d2a73bd8569c5c38f06b42d

8 years agoMerge "Hide some tuner stuff that isn't ready." into nyc-dev
Jason Monk [Wed, 24 Feb 2016 19:22:49 +0000 (19:22 +0000)]
Merge "Hide some tuner stuff that isn't ready." into nyc-dev

8 years agoMerge "Un-hide string set persistence methods in Preference" into nyc-dev
Adam Powell [Wed, 24 Feb 2016 19:13:53 +0000 (19:13 +0000)]
Merge "Un-hide string set persistence methods in Preference" into nyc-dev

8 years agoMerge "Add fallback packages to be enabled iff no webview packages are valid" into...
Gustav Sennton [Wed, 24 Feb 2016 19:00:35 +0000 (19:00 +0000)]
Merge "Add fallback packages to be enabled iff no webview packages are valid" into nyc-dev

8 years agoFix build
Jorim Jaggi [Wed, 24 Feb 2016 18:44:24 +0000 (13:44 -0500)]
Fix build

Change-Id: Id21200a8239908c18379d67639c090ccfd3772f2

8 years agoSuppress output for Protobuf data if Bluetooth is disabled
Pavlin Radoslavov [Tue, 23 Feb 2016 19:54:37 +0000 (11:54 -0800)]
Suppress output for Protobuf data if Bluetooth is disabled

If Bluetooth is disabled or there is some other error,
don't print anything when extracting the Metrics-related data
in Protobuf format.

[Cherry-pick from AOSP]

Bug: 27315491
Change-Id: Ic1ec5334fbf0b524909400f080e2eac3ec34edf4

8 years agoDont trust the user added CA store by default for apps targeting N
Chad Brubaker [Wed, 24 Feb 2016 00:01:55 +0000 (16:01 -0800)]
Dont trust the user added CA store by default for apps targeting N

Android's security model is such that the applications data is secure by
default unless the application specifically grants access to it.
Application data in transit should have similar security properties.

Bug: 27301579
Change-Id: I72f106aefecccd6edfcc1d3ae10131ad2f69a559

8 years agoFix NPE when null BackupObserver is passed into BackupManager#requestBackup()
Sergey Poromov [Wed, 24 Feb 2016 16:21:59 +0000 (17:21 +0100)]
Fix NPE when null BackupObserver is passed into BackupManager#requestBackup()

BackupManagerService has the null check, but it doesn't work
because passed BackupObserver object is wrapped into
this BackupObserverWrapper.
This was found during GTS testing.

Bug: 27334738
Change-Id: I16dc0230824b326d3fae1f8489f58b0c0d4e1c7c

8 years agoMerge "DO NOT MERGE Read Bluetooth interop database entries from settings (1/2)"...
Andre Eisenbach [Wed, 24 Feb 2016 18:35:37 +0000 (18:35 +0000)]
Merge "DO NOT MERGE Read Bluetooth interop database entries from settings (1/2)" into mnc-dr-dev

8 years agoMerge "Fix WebView Metrics opt out Javadoc formatting" into nyc-dev
Paul Miller [Wed, 24 Feb 2016 18:25:17 +0000 (18:25 +0000)]
Merge "Fix WebView Metrics opt out Javadoc formatting" into nyc-dev

8 years agoMerge "Move clock down 4dp in QS header" into nyc-dev
Jason Monk [Wed, 24 Feb 2016 18:23:44 +0000 (18:23 +0000)]
Merge "Move clock down 4dp in QS header" into nyc-dev

8 years agoMove clock down 4dp in QS header
Jason Monk [Wed, 24 Feb 2016 18:16:57 +0000 (13:16 -0500)]
Move clock down 4dp in QS header

Bug: 27319941
Change-Id: Ib4d8ea7814738f2e6b8ab3095a7e456d7c1f7366

8 years agoAlways consume bottom insets when navigation bar is force shown
Jorim Jaggi [Fri, 12 Feb 2016 23:04:21 +0000 (15:04 -0800)]
Always consume bottom insets when navigation bar is force shown

When an app requests SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION but we
force show the navigation bar, we need to treat for the app like
there is no virtual navigation bar on the device. Because if you
combine it with FLAG_HIDE_NAVIGATION, you'd expect the navigation
bar gets hidden but it doesn't, so there could be content that
overlaps with the navigation bar.

Bug: 27157904
Change-Id: I088e02eae2e723c35e9cb4873de6b1325458533b

8 years agoMerge "DPM: installKeyPair variant: caller can self-grant" into nyc-dev
Robin Lee [Wed, 24 Feb 2016 18:14:34 +0000 (18:14 +0000)]
Merge "DPM: installKeyPair variant: caller can self-grant" into nyc-dev

8 years agoFix a crash when browsing empty roots.
Ben Kwa [Wed, 24 Feb 2016 18:11:10 +0000 (10:11 -0800)]
Fix a crash when browsing empty roots.

BUG=27292682

Change-Id: I383fd359a959e86fca3f6716575027aa3b4723cf

8 years agoHide some tuner stuff that isn't ready.
Jason Monk [Wed, 24 Feb 2016 18:01:53 +0000 (13:01 -0500)]
Hide some tuner stuff that isn't ready.

Change-Id: I075098068f4c9f91705e1196b40ab2d36d658bab

8 years agoMerge "Fix bootloops in TwilightService" into nyc-dev
Jason Monk [Wed, 24 Feb 2016 18:00:44 +0000 (18:00 +0000)]
Merge "Fix bootloops in TwilightService" into nyc-dev

8 years agoMerge "Fix issue #27289462: Alarm clock not working on NRC49C" into nyc-dev
Dianne Hackborn [Wed, 24 Feb 2016 18:00:38 +0000 (18:00 +0000)]
Merge "Fix issue #27289462: Alarm clock not working on NRC49C" into nyc-dev

8 years agoMerge "Work towards issue #26390161: Throttle syncs/jobs when system is low on RAM...
Dianne Hackborn [Wed, 24 Feb 2016 18:00:27 +0000 (18:00 +0000)]
Merge "Work towards issue #26390161: Throttle syncs/jobs when system is low on RAM" into nyc-dev

8 years agoFix bootloops in TwilightService
Jason Monk [Wed, 24 Feb 2016 17:56:16 +0000 (12:56 -0500)]
Fix bootloops in TwilightService

Bug: 27336023
Change-Id: I983f05bd69fd27bb3e3ae121d19fc9d006c95ffb

8 years agoMerge "Enable to set canRecord and tunerCount statically" into nyc-dev
Jae Seo [Wed, 24 Feb 2016 17:53:46 +0000 (17:53 +0000)]
Merge "Enable to set canRecord and tunerCount statically" into nyc-dev

8 years agoMerge "DO NOT MERGE: Multi-SIM - Fixing inconsistent naming in CarrierConfigManager...
Shishir Agrawal [Wed, 24 Feb 2016 17:42:33 +0000 (17:42 +0000)]
Merge "DO NOT MERGE: Multi-SIM - Fixing inconsistent naming in CarrierConfigManager." into mm-wireless-dev
am: d94fbf85d6  -s ours

* commit 'd94fbf85d6b9affc29fb312abd3548f3727c80c4':
  DO NOT MERGE: Multi-SIM - Fixing inconsistent naming in CarrierConfigManager.

8 years agoMerge "Add subscription specific TelephonyManager calls." into nyc-dev
Shishir Agrawal [Wed, 24 Feb 2016 17:35:44 +0000 (17:35 +0000)]
Merge "Add subscription specific TelephonyManager calls." into nyc-dev

8 years agoMerge "DO NOT MERGE: Multi-SIM - Fixing inconsistent naming in CarrierConfigManager...
Shishir Agrawal [Wed, 24 Feb 2016 17:33:11 +0000 (17:33 +0000)]
Merge "DO NOT MERGE: Multi-SIM - Fixing inconsistent naming in CarrierConfigManager." into mm-wireless-dev

8 years agoMerge "Add SystemApi for retrieving device flash lock state" into nyc-dev
Andres Morales [Wed, 24 Feb 2016 17:30:25 +0000 (17:30 +0000)]
Merge "Add SystemApi for retrieving device flash lock state" into nyc-dev

8 years agoDPM: installKeyPair variant: caller can self-grant
Robin Lee [Wed, 24 Feb 2016 12:08:32 +0000 (12:08 +0000)]
DPM: installKeyPair variant: caller can self-grant

If 'requestAccess' is true, the caller (either profile/device owner or a
designated certificate installer) will be granted usage of the keypair
on successful installation.

This has no security implications for a profile/device owner which would
already be able to self-grant. Delegated certificate installers did not
have this ability before.

This is only allowed at install-time- not afterward.

Bug: 24746231
Change-Id: Ia0ec290bb0bcde1d8137c188e2667cb7718dbfd7

8 years agoMerge "Audio record notification: report client/device configuration" into nyc-dev
Jean-Michel Trivi [Wed, 24 Feb 2016 17:08:32 +0000 (17:08 +0000)]
Merge "Audio record notification: report client/device configuration" into nyc-dev

8 years agoMerge "Don't try caching null ringtones." into nyc-dev
Jeff Sharkey [Wed, 24 Feb 2016 16:55:36 +0000 (16:55 +0000)]
Merge "Don't try caching null ringtones." into nyc-dev

8 years agoDon't try caching null ringtones.
Jeff Sharkey [Wed, 24 Feb 2016 16:54:14 +0000 (09:54 -0700)]
Don't try caching null ringtones.

Bug: 27330629
Change-Id: Id09d10d6f4a3a20782480647c68a5c94ef69e7b3

8 years agoMerge "Fix error formatting for copy/move/delete failures." into nyc-dev
Steve McKay [Wed, 24 Feb 2016 16:24:28 +0000 (16:24 +0000)]
Merge "Fix error formatting for copy/move/delete failures." into nyc-dev

8 years agoMerge "Add constant to link to app's general settings" into nyc-dev
Jason Monk [Wed, 24 Feb 2016 16:23:01 +0000 (16:23 +0000)]
Merge "Add constant to link to app's general settings" into nyc-dev

8 years agoOnly prolong animations for freeform
Jorim Jaggi [Wed, 24 Feb 2016 02:21:40 +0000 (21:21 -0500)]
Only prolong animations for freeform

So we don't unnecessarily slow down the regular transition

Change-Id: I84e4bf0f9a7caf59dd20478166458f2642e98c80

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Wed, 24 Feb 2016 15:37:35 +0000 (15:37 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 24 Feb 2016 15:32:23 +0000 (07:32 -0800)]
Import translations. DO NOT MERGE

Change-Id: I5cf7b687227eab1006fd0fe7b8bd09bb8e1740e2
Auto-generated-cl: translation import

8 years agoAdd constant to link to app's general settings
Jason Monk [Tue, 23 Feb 2016 22:57:28 +0000 (17:57 -0500)]
Add constant to link to app's general settings

Bug: 27276982
Change-Id: Ia438faeb12b24251bb74919f680713a7bc03e0b5

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Wed, 24 Feb 2016 15:23:12 +0000 (15:23 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev