OSDN Git Service

android-x86/frameworks-base.git
7 years agoClear the calling ID in dump().
Jeremy Joslin [Thu, 26 Jan 2017 02:20:21 +0000 (18:20 -0800)]
Clear the calling ID in dump().

Test: manual
Bug: 34705474
Change-Id: Iac122f016058963dd262c421c7a67d84e43c7949

7 years agoUpdates to the cache filtering impl.
Jeremy Joslin [Wed, 25 Jan 2017 19:40:08 +0000 (11:40 -0800)]
Updates to the cache filtering impl.

Addressing comments from ag/1828816.

Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Bug: 34127291
Change-Id: I4c927caaedc722400c8cb52334ab261afa1ffaa5

7 years agoMerge "Overhaul RenderNode's DisplayList management"
John Reck [Wed, 25 Jan 2017 23:11:26 +0000 (23:11 +0000)]
Merge "Overhaul RenderNode's DisplayList management"

7 years agoMerge "mediaplayer: add buffering settings API"
TreeHugger Robot [Wed, 25 Jan 2017 21:53:29 +0000 (21:53 +0000)]
Merge "mediaplayer: add buffering settings API"

7 years agoMerge "Merge changes from topic 'usb_bugfix' into nyc-mr2-dev am: 55772c73c0" into...
Jerry Zhang [Wed, 25 Jan 2017 21:41:30 +0000 (21:41 +0000)]
Merge "Merge changes from topic 'usb_bugfix' into nyc-mr2-dev am: 55772c73c0" into nyc-mr2-dev-plus-aosp
am: 7fef16ff24

Change-Id: I23ce12aab4bc75fb0899626da052bfec5f64a604

7 years agoMerge changes from topic 'usb_bugfix' into nyc-mr2-dev am: 55772c73c0
Jerry Zhang [Wed, 25 Jan 2017 21:41:25 +0000 (21:41 +0000)]
Merge changes from topic 'usb_bugfix' into nyc-mr2-dev am: 55772c73c0
am: 473e3953f5

Change-Id: I333ec4ca60afdd44d0d859eb654d121f6dee95da

7 years agoMerge "zygote: don't drop CAP_SYS_PTRACE from the bounding set." am: 273b886c49 am...
Josh Gao [Wed, 25 Jan 2017 21:39:57 +0000 (21:39 +0000)]
Merge "zygote: don't drop CAP_SYS_PTRACE from the bounding set." am: 273b886c49 am: e801810553 am: a07e5312cc
am: 0ebf87e3e7

Change-Id: Ic99476b698ccc056eb97f83d64e844c3fffa481f

7 years agoRefactored setCurrentFunction and setUsbDataUnlocked into single method. am: 48824962...
Jerry Zhang [Wed, 25 Jan 2017 21:32:16 +0000 (21:32 +0000)]
Refactored setCurrentFunction and setUsbDataUnlocked into single method. am: 4882496232  -s ours
am: 270c4bcd86

Change-Id: I935dfed207d96aba169c6da07fa26d57781f5f93

7 years agoClean up persistent usb state on boot. am: bfc5d563aa -s ours
Jerry Zhang [Wed, 25 Jan 2017 21:31:24 +0000 (21:31 +0000)]
Clean up persistent usb state on boot. am: bfc5d563aa  -s ours
am: 6cf9bfde00

Change-Id: If911ea57fe1259029c0825d4a697f0098692f07d

7 years agoMerge "Merge changes from topic 'usb_bugfix' into nyc-mr2-dev am: 55772c73c0" into...
Android Build Merger (Role) [Wed, 25 Jan 2017 21:31:03 +0000 (21:31 +0000)]
Merge "Merge changes from topic 'usb_bugfix' into nyc-mr2-dev am: 55772c73c0" into nyc-mr2-dev-plus-aosp

7 years agoFixed handling of usb state during adb changes. am: 541295a9a5 -s ours
Jerry Zhang [Wed, 25 Jan 2017 21:30:08 +0000 (21:30 +0000)]
Fixed handling of usb state during adb changes. am: 541295a9a5  -s ours
am: e5a8b4f12c

Change-Id: Iabd888a924226e0a333fe0600daf4bec154eb832

7 years agoMerge changes from topic 'usb_bugfix' into nyc-mr2-dev
Jerry Zhang [Wed, 25 Jan 2017 21:30:07 +0000 (21:30 +0000)]
Merge changes from topic 'usb_bugfix' into nyc-mr2-dev
am: 55772c73c0

Change-Id: Ie41c7e8b7a687e9836354d429e66b5f214a6d0b2

7 years agoMerge "zygote: don't drop CAP_SYS_PTRACE from the bounding set." am: 273b886c49 am...
Josh Gao [Wed, 25 Jan 2017 21:30:03 +0000 (21:30 +0000)]
Merge "zygote: don't drop CAP_SYS_PTRACE from the bounding set." am: 273b886c49 am: e801810553
am: a07e5312cc

Change-Id: I9165a6dc33058ec4f7bd8a6c6f4426af405bda19

7 years agoMerge "zygote: don't drop CAP_SYS_PTRACE from the bounding set." am: 273b886c49
Josh Gao [Wed, 25 Jan 2017 21:25:23 +0000 (21:25 +0000)]
Merge "zygote: don't drop CAP_SYS_PTRACE from the bounding set." am: 273b886c49
am: e801810553

Change-Id: I636c0f021c6ffae4518d889b1e7c4c3c29c6e864

7 years agoRefactored setCurrentFunction and setUsbDataUnlocked into single method.
Jerry Zhang [Wed, 25 Jan 2017 21:23:54 +0000 (21:23 +0000)]
Refactored setCurrentFunction and setUsbDataUnlocked into single method.
am: 4882496232  -s ours

Change-Id: Ia50fbb88cdaa9e3570b68798b82df609475b5fe6

7 years agoClean up persistent usb state on boot.
Jerry Zhang [Wed, 25 Jan 2017 21:22:54 +0000 (21:22 +0000)]
Clean up persistent usb state on boot.
am: bfc5d563aa  -s ours

Change-Id: Idd46b3f5a0c3a608a3178855b67afbce1cf21acb

7 years agoFixed handling of usb state during adb changes.
Jerry Zhang [Wed, 25 Jan 2017 21:22:07 +0000 (21:22 +0000)]
Fixed handling of usb state during adb changes.
am: 541295a9a5  -s ours

Change-Id: I608202f6c74d0209f5507f838f103f874ed47e3b

7 years agoMerge "zygote: don't drop CAP_SYS_PTRACE from the bounding set."
Josh Gao [Wed, 25 Jan 2017 21:21:29 +0000 (21:21 +0000)]
Merge "zygote: don't drop CAP_SYS_PTRACE from the bounding set."
am: 273b886c49

Change-Id: I82c58cd03c8db78a1733ba5070d314607475cee7

7 years agoMerge "zygote: don't drop CAP_SYS_PTRACE from the bounding set."
Josh Gao [Wed, 25 Jan 2017 21:16:57 +0000 (21:16 +0000)]
Merge "zygote: don't drop CAP_SYS_PTRACE from the bounding set."

7 years agoMerge "Add some new experiment constants for activity and power manager."
Dianne Hackborn [Wed, 25 Jan 2017 21:12:09 +0000 (21:12 +0000)]
Merge "Add some new experiment constants for activity and power manager."

7 years agoMerge "Camera2: Handle (0, 0) size for deferred OutputConfiguration"
Shuzhen Wang [Wed, 25 Jan 2017 21:05:42 +0000 (21:05 +0000)]
Merge "Camera2: Handle (0, 0) size for deferred OutputConfiguration"

7 years agoMerge "Implement TextClassifierImpl.getLinks"
Abodunrinwa Toki [Wed, 25 Jan 2017 21:04:59 +0000 (21:04 +0000)]
Merge "Implement TextClassifierImpl.getLinks"

7 years agoSkip resizing the stack when there is no current bounds.
Winson Chung [Wed, 25 Jan 2017 19:00:21 +0000 (11:00 -0800)]
Skip resizing the stack when there is no current bounds.

- When initially calling loadConfigurationsAndApply(), the state is
  set to STATE_NO_PIP when there is no pinned stack.  As of change
  ag/1725150, resizeStack no longer fails silently when there is no
  such stack to resize.  This CL skips the call to resizeStack() when
  the PiP mode is set to STATE_NO_PIP.

Bug: 34692144
Test: Try and launch Fugu
Change-Id: Ic539f4431c2f94e7c10520c383fa49157d1d0631

7 years agoMerge changes from topic 'usb_bugfix' into nyc-mr2-dev
Jerry Zhang [Wed, 25 Jan 2017 20:30:17 +0000 (20:30 +0000)]
Merge changes from topic 'usb_bugfix' into nyc-mr2-dev

* changes:
  Refactored setCurrentFunction and setUsbDataUnlocked into single method.
  Clean up persistent usb state on boot.
  Fixed handling of usb state during adb changes.

7 years agoOverhaul RenderNode's DisplayList management
John Reck [Wed, 25 Jan 2017 18:58:30 +0000 (10:58 -0800)]
Overhaul RenderNode's DisplayList management

* Move mValid to native
* Have destroyHardwareResources destroy everything
* Remove flaky mParentCount checks in setStaging
* All tree updates have an internal observer to
  ensure onRemovedFromTree() is a reliable signal
* onRemovedFromTree() immediately releases resources
  to avoid displaylist "leaks"

Test: Unit tests for validity added & pass, manually
verified that b/34072929 doesn't repro

Bug: 34072929

Change-Id: I856534b4ed1b7f009fc4b7cd13209b97fa42a71c

7 years agoMerge "Fix a use-of-uninitialized-value warning." am: 500cf67206 am: f77f2cb3e7 am...
George Burgess IV [Wed, 25 Jan 2017 20:23:58 +0000 (20:23 +0000)]
Merge "Fix a use-of-uninitialized-value warning." am: 500cf67206 am: f77f2cb3e7 am: 0c6283e396
am: 858852a6dc

Change-Id: Ib874408eb77d265a9e939679bd2c5459217063e8

7 years agoCamera2: Handle (0, 0) size for deferred OutputConfiguration
Shuzhen Wang [Wed, 25 Jan 2017 19:53:22 +0000 (11:53 -0800)]
Camera2: Handle (0, 0) size for deferred OutputConfiguration

We need to handle below sequence of events:
1. OutputConfiguration(Size(0, 0), klass)
2. addSurface(surface)
3. createCameraCaptureSession

In this case, allow the addSurface() to succeed.

Test: camera works in keep/hangouts/contacts
Bug: 34697112
Change-Id: I726c60cce9a11c69b050aad47f4ed4a0a7a0870e

7 years agoMerge "Resolve Android security comments for Android ID migration."
Mark Rathjen [Wed, 25 Jan 2017 20:20:26 +0000 (20:20 +0000)]
Merge "Resolve Android security comments for Android ID migration."

7 years agoMerge "Also parse "1" as true for ContentValues#getAsBoolean"
TreeHugger Robot [Wed, 25 Jan 2017 20:19:05 +0000 (20:19 +0000)]
Merge "Also parse "1" as true for ContentValues#getAsBoolean"

7 years agoMerge "Fix a use-of-uninitialized-value warning." am: 500cf67206 am: f77f2cb3e7
George Burgess IV [Wed, 25 Jan 2017 20:19:05 +0000 (20:19 +0000)]
Merge "Fix a use-of-uninitialized-value warning." am: 500cf67206 am: f77f2cb3e7
am: 0c6283e396

Change-Id: Ife5d9444f9036c16540bd7bf7a1c0e17cf296df5

7 years agoMerge "Fix a use-of-uninitialized-value warning." am: 500cf67206
George Burgess IV [Wed, 25 Jan 2017 20:14:00 +0000 (20:14 +0000)]
Merge "Fix a use-of-uninitialized-value warning." am: 500cf67206
am: f77f2cb3e7

Change-Id: I44e23c5689b51ae002a8db71a537ab97d3f31121

7 years agoMerge "Merge "nfc: Make NDEF validation stricter" am: f3a6269fed am: e6cb2aa614 am...
Android Build Merger (Role) [Wed, 25 Jan 2017 20:12:59 +0000 (20:12 +0000)]
Merge "Merge "nfc: Make NDEF validation stricter" am: f3a6269fed am: e6cb2aa614 am: 40c14a83d0 am: deac669a53"

7 years agoMerge "[clipboard] Clipboard sharing"
TreeHugger Robot [Wed, 25 Jan 2017 20:12:13 +0000 (20:12 +0000)]
Merge "[clipboard] Clipboard sharing"

7 years agoMerge "nfc: Make NDEF validation stricter" am: f3a6269fed am: e6cb2aa614 am: 40c14a83d0
Ruchi Kandoi [Wed, 25 Jan 2017 20:12:06 +0000 (20:12 +0000)]
Merge "nfc: Make NDEF validation stricter" am: f3a6269fed am: e6cb2aa614 am: 40c14a83d0
am: deac669a53

Change-Id: I208e9c5d6fbbfa9f3a6c0d43f38fcacc040ccb92

7 years agoMerge "Fix a use-of-uninitialized-value warning."
George Burgess IV [Wed, 25 Jan 2017 20:09:26 +0000 (20:09 +0000)]
Merge "Fix a use-of-uninitialized-value warning."
am: 500cf67206

Change-Id: I8b171a90696e09c42a1506255bc4c0056f69f35c

7 years agoMerge "nfc: Make NDEF validation stricter" am: f3a6269fed am: e6cb2aa614
Ruchi Kandoi [Wed, 25 Jan 2017 20:07:23 +0000 (20:07 +0000)]
Merge "nfc: Make NDEF validation stricter" am: f3a6269fed am: e6cb2aa614
am: 40c14a83d0

Change-Id: I7ef55eddac20d58e9184056e85c9b49e733fd38d

7 years agozygote: don't drop CAP_SYS_PTRACE from the bounding set.
Josh Gao [Wed, 25 Jan 2017 19:45:58 +0000 (11:45 -0800)]
zygote: don't drop CAP_SYS_PTRACE from the bounding set.

crash_dump needs to acquire CAP_SYS_PTRACE to be able to ptrace
processes with capabilities. selinux should hopefully be sufficient for
restricting ptrace to processes that should do it.

Bug: http://b/34694637
Test: debuggerd `pidof system_server`
Change-Id: If46f0b9baa54529780f7767f309f76b102a42ab4

7 years agoMerge "nfc: Make NDEF validation stricter" am: f3a6269fed
Ruchi Kandoi [Wed, 25 Jan 2017 20:03:00 +0000 (20:03 +0000)]
Merge "nfc: Make NDEF validation stricter" am: f3a6269fed
am: e6cb2aa614

Change-Id: Ib069a18f16850d419b6c10c3b80e80115d9d8fc8

7 years agoMerge "Fix a use-of-uninitialized-value warning."
Treehugger Robot [Wed, 25 Jan 2017 20:01:33 +0000 (20:01 +0000)]
Merge "Fix a use-of-uninitialized-value warning."

7 years agoMerge "nfc: Make NDEF validation stricter"
Ruchi Kandoi [Wed, 25 Jan 2017 19:59:16 +0000 (19:59 +0000)]
Merge "nfc: Make NDEF validation stricter"
am: f3a6269fed

Change-Id: If69e586c81e5926c0795af3689de67b260891eaa

7 years agoMerge "Fix build breakage"
Rubin Xu [Wed, 25 Jan 2017 19:56:37 +0000 (19:56 +0000)]
Merge "Fix build breakage"

7 years agoMerge "Fix up the tests (yet again)"
Jason Monk [Wed, 25 Jan 2017 19:55:33 +0000 (19:55 +0000)]
Merge "Fix up the tests (yet again)"

7 years agomediaplayer: add buffering settings API
Wei Jia [Mon, 16 Jan 2017 18:18:15 +0000 (10:18 -0800)]
mediaplayer: add buffering settings API

Test: compiles, ensured that params is passed all the way to source
Bug:32524218

Change-Id: I90d65e10012ecc1a78989eba80d025d513ceaadf

7 years agoMerge "nfc: Make NDEF validation stricter"
Treehugger Robot [Wed, 25 Jan 2017 19:53:59 +0000 (19:53 +0000)]
Merge "nfc: Make NDEF validation stricter"

7 years agoMerge "Started visual hierarchy for min priority notifications"
Selim Cinek [Wed, 25 Jan 2017 19:53:46 +0000 (19:53 +0000)]
Merge "Started visual hierarchy for min priority notifications"

7 years agoMerge "Initial IME integration."
TreeHugger Robot [Wed, 25 Jan 2017 19:44:29 +0000 (19:44 +0000)]
Merge "Initial IME integration."

7 years agoMerge "Fix issue with PiP hiding when dragging divider."
TreeHugger Robot [Wed, 25 Jan 2017 19:31:53 +0000 (19:31 +0000)]
Merge "Fix issue with PiP hiding when dragging divider."

7 years agoMerge "Fixing issue with wrong bounds being reported in StackInfo."
TreeHugger Robot [Wed, 25 Jan 2017 19:28:57 +0000 (19:28 +0000)]
Merge "Fixing issue with wrong bounds being reported in StackInfo."

7 years agoMerge "Expose intents for launching channel settings."
TreeHugger Robot [Wed, 25 Jan 2017 19:20:18 +0000 (19:20 +0000)]
Merge "Expose intents for launching channel settings."

7 years agoMerge "Move theme out of tuner and into display settings"
TreeHugger Robot [Wed, 25 Jan 2017 19:17:19 +0000 (19:17 +0000)]
Merge "Move theme out of tuner and into display settings"

7 years agoFix build breakage
Rubin Xu [Wed, 25 Jan 2017 19:13:27 +0000 (19:13 +0000)]
Fix build breakage

Implement new methods in MockStorageManager

Test: it builds
Change-Id: Icdd49a1b6709ab63a8b00328b9da8120482bbc8a

7 years agoMerge "Changed cluster kb navigation shortcut to meta+[shift]+tab"
Evan Rosky [Wed, 25 Jan 2017 19:04:16 +0000 (19:04 +0000)]
Merge "Changed cluster kb navigation shortcut to meta+[shift]+tab"

7 years agoMerge changes I100dac6b,Ibbecac7e
Robert Sesek [Wed, 25 Jan 2017 19:00:40 +0000 (19:00 +0000)]
Merge changes I100dac6b,Ibbecac7e

* changes:
  Enable multiprocess WebView by default.
  Prepare to enable multiprocess by default.

7 years agoMerge "MessagingStyle: Add historic messages"
TreeHugger Robot [Wed, 25 Jan 2017 18:47:17 +0000 (18:47 +0000)]
Merge "MessagingStyle: Add historic messages"

7 years agoMerge "Add unit tests for LockSettingsService"
Rubin Xu [Wed, 25 Jan 2017 18:38:28 +0000 (18:38 +0000)]
Merge "Add unit tests for LockSettingsService"

7 years agoMerge "Merge "Require password to FR in carrier demo mode""
Christine Franks [Wed, 25 Jan 2017 18:38:00 +0000 (18:38 +0000)]
Merge "Merge "Require password to FR in carrier demo mode""

7 years agoMerge "Bluetooth: fix indentation, formatting in dumpsys" am: 35c715332f am: 36ce9b7e...
Andre Eisenbach [Wed, 25 Jan 2017 18:28:55 +0000 (18:28 +0000)]
Merge "Bluetooth: fix indentation, formatting in dumpsys" am: 35c715332f am: 36ce9b7ea0 am: 8b1d096e58
am: c39388d605

Change-Id: I51a9cec90c232b6f16e50f9a962bf2795bbf725b

7 years agoMerge "Bluetooth: fix indentation, formatting in dumpsys" am: 35c715332f am: 36ce9b7ea0
Andre Eisenbach [Wed, 25 Jan 2017 18:23:50 +0000 (18:23 +0000)]
Merge "Bluetooth: fix indentation, formatting in dumpsys" am: 35c715332f am: 36ce9b7ea0
am: 8b1d096e58

Change-Id: I4fd28828d5ed8ec2a3e93b6f8ab074dccdcb30e2

7 years agonfc: Make NDEF validation stricter
Ruchi Kandoi [Wed, 25 Jan 2017 02:32:01 +0000 (18:32 -0800)]
nfc: Make NDEF validation stricter

- Check if the MB is not set for any record apart from the first one.
- If the record is chunked, first record must contain the type

Bug: 20722275
Test: Manual; write raw NDEF messages to a tag
Change-Id: I3e73fc5163bbcd8a1f23417e98f57b665f4f1fad
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
7 years agoMerge "Bluetooth: fix indentation, formatting in dumpsys" am: 35c715332f
Andre Eisenbach [Wed, 25 Jan 2017 18:19:51 +0000 (18:19 +0000)]
Merge "Bluetooth: fix indentation, formatting in dumpsys" am: 35c715332f
am: 36ce9b7ea0

Change-Id: I3381764156fadf755d679b9a3c9356fc90e50fd2

7 years agoMerge "Bluetooth: fix indentation, formatting in dumpsys"
Andre Eisenbach [Wed, 25 Jan 2017 18:16:27 +0000 (18:16 +0000)]
Merge "Bluetooth: fix indentation, formatting in dumpsys"
am: 35c715332f

Change-Id: I7c603ab9f50921afb45e3d7181541260d8939089

7 years ago[clipboard] Clipboard sharing
Grigory Dzhavadyan [Thu, 3 Nov 2016 21:39:26 +0000 (21:39 +0000)]
[clipboard] Clipboard sharing

The fix has been submitted to the emulator: https://android-review.googlesource.com/#/c/298922/

Resolved merge conflict with 1611052.

Change-Id: Ic1e9a3d2dfc3c933d83482d92bfb4da1fee4ebbe

7 years agoMerge "media: Relax the filedescriptor check to allow write-only mode."
Hangyu Kuang [Wed, 25 Jan 2017 18:07:22 +0000 (18:07 +0000)]
Merge "media: Relax the filedescriptor check to allow write-only mode."

7 years agoMerge "Test: AccountManagerService APCT test."
Hongming Jin [Wed, 25 Jan 2017 18:06:28 +0000 (18:06 +0000)]
Merge "Test: AccountManagerService APCT test."

7 years agoMerge "Bluetooth: fix indentation, formatting in dumpsys"
Andre Eisenbach [Wed, 25 Jan 2017 18:05:10 +0000 (18:05 +0000)]
Merge "Bluetooth: fix indentation, formatting in dumpsys"

7 years agoBluetooth: fix indentation, formatting in dumpsys
Marie Janssen [Wed, 18 Jan 2017 17:37:52 +0000 (09:37 -0800)]
Bluetooth: fix indentation, formatting in dumpsys

Before
======
Enable log:
01-17 09:43:18   Enabled  by com.android.systemui
01-18 07:13:10  Disabled  by com.andorid.systemui

1 BLE Apps registered:
com.google.android.gms

After
=====
Enable log:
  02-06 07:49:07   Enabled  by system boot
  02-06 07:49:35  Disabled  by com.andorid.systemui

1 BLE App registered:
  com.google.android.gms

Test: run bugreport, see differences in dumpsys
Change-Id: I6086f7f97c1fcbdb860d70d9516fd5bf630a9f5e

7 years agoMerge changes I50d2903e,Ieb347ce3
Edman Anjos [Wed, 25 Jan 2017 17:59:59 +0000 (17:59 +0000)]
Merge changes I50d2903e,Ieb347ce3

* changes:
  Add DPMS delegation scopes.
  Add block uninstall delegation in DPMS.

7 years agomedia: Relax the filedescriptor check to allow write-only mode.
Hangyu Kuang [Mon, 23 Jan 2017 21:23:17 +0000 (13:23 -0800)]
media: Relax the filedescriptor check to allow write-only mode.

Test: Use the MMS app to record video.
Bug: 34594319
Change-Id: I0680c48f5f240e2b18264dbf952622ad0497130b

7 years agoFixing issue with wrong bounds being reported in StackInfo.
Winson Chung [Wed, 25 Jan 2017 17:44:25 +0000 (09:44 -0800)]
Fixing issue with wrong bounds being reported in StackInfo.

Bug: 34696293
Test: Launch overview from any app
Change-Id: I99a33b3abc9aea54ff12bf2d37a54aeefcdd535e

7 years agoExpose intents for launching channel settings.
Julia Reynolds [Wed, 25 Jan 2017 15:31:34 +0000 (10:31 -0500)]
Expose intents for launching channel settings.

Test: manual
Change-Id: I86e12b0ed6b60660b9f6bd1015c186897418560e

7 years agoMove theme out of tuner and into display settings
Jason Monk [Wed, 25 Jan 2017 15:33:31 +0000 (10:33 -0500)]
Move theme out of tuner and into display settings

Change-Id: Id939a8a34e92c6190c59317155238697861a65e5
Fixes: 34682466
Test: Manual

7 years agoMerge "Tron logging - Fix isValidValue to match its name, allow nulls."
TreeHugger Robot [Wed, 25 Jan 2017 17:25:15 +0000 (17:25 +0000)]
Merge "Tron logging - Fix isValidValue to match its name, allow nulls."

7 years agoMerge "Add support for BLOB format to HardwareBuffer."
TreeHugger Robot [Wed, 25 Jan 2017 17:23:21 +0000 (17:23 +0000)]
Merge "Add support for BLOB format to HardwareBuffer."

7 years agoMerge "New functionalities for AnimatorSet: Reverse, Seek"
Doris Liu [Wed, 25 Jan 2017 17:22:57 +0000 (17:22 +0000)]
Merge "New functionalities for AnimatorSet: Reverse, Seek"

7 years agoMerge "Require password to FR in carrier demo mode"
Christine Franks [Tue, 24 Jan 2017 01:19:13 +0000 (17:19 -0800)]
Merge "Require password to FR in carrier demo mode"

Bug: 34341567
Test: manual - still builds
Change-Id: Ie450a97db5c3ce58a1a5e43334bb0546a3c48645

7 years agoMerge "Register new TTS settings page for speed and pitch sliders."
Niels Egberts [Wed, 25 Jan 2017 17:10:51 +0000 (17:10 +0000)]
Merge "Register new TTS settings page for speed and pitch sliders."

7 years agoMerge "Add support for Split APK dependcies"
Adam Lesinski [Wed, 25 Jan 2017 16:56:48 +0000 (16:56 +0000)]
Merge "Add support for Split APK dependcies"

7 years agoMessagingStyle: Add historic messages
Adrian Roos [Wed, 18 Jan 2017 23:47:03 +0000 (15:47 -0800)]
MessagingStyle: Add historic messages

Adds an API to supply additional context to a Notification that uses
MessagingStyle. To be used in the future to enhance the Direct Reply
experience.

Test: runtest cts
Change-Id: I6da0b9067cbffbaae2bd3c5d9606a0b5437f1ed4

7 years agoMerge "What color starts with O?"
Daniel Sandler [Wed, 25 Jan 2017 16:45:36 +0000 (16:45 +0000)]
Merge "What color starts with O?"

7 years agoMerge "use new clipbounds api"
TreeHugger Robot [Wed, 25 Jan 2017 16:40:33 +0000 (16:40 +0000)]
Merge "use new clipbounds api"

7 years agoWhat color starts with O?
Dan Sandler [Wed, 25 Jan 2017 02:46:31 +0000 (21:46 -0500)]
What color starts with O?

Fixes: 34609358
Test: visual
Change-Id: I00f4559abc30720ee04c09e0d04fa91de67ceeb9
Hint: NOT TEAL

7 years agoMerge "Wipe device or profile if max failed attempt reached"
Esteban Talavera [Wed, 25 Jan 2017 16:17:34 +0000 (16:17 +0000)]
Merge "Wipe device or profile if max failed attempt reached"

7 years agoMerge "Decrease frequency of high temp warnings" into nyc-mr2-dev am: a60f7151e6
Andrew Sapperstein [Wed, 25 Jan 2017 16:14:33 +0000 (16:14 +0000)]
Merge "Decrease frequency of high temp warnings" into nyc-mr2-dev am: a60f7151e6
am: 4715e5c6a9

Change-Id: I540802c6207fd80beb8dfe1298d33e0efea3549e

7 years agoDecrease frequency of high temp warnings am: 97bfa0f17d
Andrew Sapperstein [Wed, 25 Jan 2017 16:13:39 +0000 (16:13 +0000)]
Decrease frequency of high temp warnings am: 97bfa0f17d
am: be0f185de9

Change-Id: I8922139364c0b03927141236325b3ce667280dc6

7 years agoMerge "Decrease frequency of high temp warnings" into nyc-mr2-dev
Andrew Sapperstein [Wed, 25 Jan 2017 16:08:47 +0000 (16:08 +0000)]
Merge "Decrease frequency of high temp warnings" into nyc-mr2-dev
am: a60f7151e6

Change-Id: I11be13e9f6404cc74fa44cb6a8278a019634ecf1

7 years agoDecrease frequency of high temp warnings
Andrew Sapperstein [Wed, 25 Jan 2017 16:08:41 +0000 (16:08 +0000)]
Decrease frequency of high temp warnings
am: 97bfa0f17d

Change-Id: I48237148a12cbf8b11df798001aa5c99428a6daa

7 years agoMerge "Allow notifications to be autocanceled at a time."
Julia Reynolds [Wed, 25 Jan 2017 16:03:36 +0000 (16:03 +0000)]
Merge "Allow notifications to be autocanceled at a time."

7 years agoMerge "Decrease frequency of high temp warnings" into nyc-mr2-dev
Andrew Sapperstein [Wed, 25 Jan 2017 16:01:04 +0000 (16:01 +0000)]
Merge "Decrease frequency of high temp warnings" into nyc-mr2-dev

7 years agoTron logging - Fix isValidValue to match its name, allow nulls.
Alison Cichowlas [Wed, 25 Jan 2017 13:51:45 +0000 (08:51 -0500)]
Tron logging - Fix isValidValue to match its name, allow nulls.

Test: runtest --path frameworks/base/core/tests/coretests/src/android/metrics/LogMakerTest.java
Change-Id: I92567e1873c5178606ac88135b5934d760b4ec24

7 years agoAdd DPMS delegation scopes.
Edman Anjos [Fri, 13 Jan 2017 21:26:17 +0000 (22:26 +0100)]
Add DPMS delegation scopes.

Implement the permission grant, package access, enable system app, and
keep uninstalled packages delegation scope APIs in the
DevicePolicyManagerService.

This feature gives a device owner or profile owner the ability to
delegate some of its privileges to another application.

Bug: 331052873310528433105719
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.MixedDeviceOwnerTest#testDelegation
Change-Id: I50d2903eb73ae7844ec1f6fe07e41101ea2760ea

7 years agoAdd block uninstall delegation in DPMS.
Edman Anjos [Mon, 19 Dec 2016 19:25:54 +0000 (11:25 -0800)]
Add block uninstall delegation in DPMS.

Implement the uninstall blocker delegation scope API in
DevicePolicyManagerSercice.

This feature gives a device owner or profile owner the ability to
delegate some of its privileges to another application.

Bug: 33105718
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.MixedDeviceOwnerTest#testDelegation
Change-Id: Ieb347ce3fb6219fe7f04cafbcd1e6b7359b31a10

7 years agoMerge "Make one method slightly less useful to save others"
TreeHugger Robot [Wed, 25 Jan 2017 15:28:27 +0000 (15:28 +0000)]
Merge "Make one method slightly less useful to save others"

7 years agoMerge "Refactor DPMS Cert Installer and App Restrictions delegation."
Edman Anjos [Wed, 25 Jan 2017 15:19:24 +0000 (15:19 +0000)]
Merge "Refactor DPMS Cert Installer and App Restrictions delegation."

7 years agoMerge "Fix crash with FontProvider"
TreeHugger Robot [Wed, 25 Jan 2017 15:01:02 +0000 (15:01 +0000)]
Merge "Fix crash with FontProvider"

7 years agoAllow notifications to be autocanceled at a time.
Julia Reynolds [Mon, 28 Nov 2016 19:29:25 +0000 (14:29 -0500)]
Allow notifications to be autocanceled at a time.

Test: cts
Change-Id: I24ebcab2c0fa2028ec5d2984dc3b7ec19391b590

7 years agouse new clipbounds api
Mike Reed [Wed, 25 Jan 2017 13:23:25 +0000 (08:23 -0500)]
use new clipbounds api

Allows us to remove SK_SUPPORT_LEGACY_GETCLIPBOUNDS flag

Change-Id: I7c6665b4eb67c58fe747c07b8b87d58fe9b10120

7 years agoFix crash with FontProvider
Seigo Nonaka [Wed, 25 Jan 2017 13:25:10 +0000 (22:25 +0900)]
Fix crash with FontProvider

Need to freeze the FontFamily otherwise the FontFamily is not created.

Test: manually done
Change-Id: I81a6f0d295f13bbeb059deafb4283654f97c0090

7 years agoMerge "Fingerprint: check current user or profile properly"
Charles He [Wed, 25 Jan 2017 12:48:41 +0000 (12:48 +0000)]
Merge "Fingerprint: check current user or profile properly"

7 years agoMerge "Lock all profile tasks if keyguard is locked too"
Robin Lee [Wed, 25 Jan 2017 12:47:56 +0000 (12:47 +0000)]
Merge "Lock all profile tasks if keyguard is locked too"

7 years agoMerge "Send DEVICE_OWNER_CHANGED to manifest receivers in background"
Victor Chang [Wed, 25 Jan 2017 12:13:32 +0000 (12:13 +0000)]
Merge "Send DEVICE_OWNER_CHANGED to manifest receivers in background"