304760 Commits

Author SHA1 Message Date
Jerry Zhang
5b15e37678 Merge "Merge changes from topic 'usb_bugfix' into nyc-mr2-dev am: 55772c73c0" into nyc-mr2-dev-plus-aosp
am: 7fef16ff24

Change-Id: I23ce12aab4bc75fb0899626da052bfec5f64a604
2017-01-25 21:41:30 +00:00
Jerry Zhang
8f5f089457 Merge changes from topic 'usb_bugfix' into nyc-mr2-dev am: 55772c73c0
am: 473e3953f5

Change-Id: I333ec4ca60afdd44d0d859eb654d121f6dee95da
2017-01-25 21:41:25 +00:00
Josh Gao
8d2f9e0cf3 Merge "zygote: don't drop CAP_SYS_PTRACE from the bounding set." am: 273b886c49 am: e801810553 am: a07e5312cc
am: 0ebf87e3e7

Change-Id: Ic99476b698ccc056eb97f83d64e844c3fffa481f
2017-01-25 21:39:57 +00:00
Jerry Zhang
40832f9be2 Refactored setCurrentFunction and setUsbDataUnlocked into single method. am: 4882496232 -s ours
am: 270c4bcd86

Change-Id: I935dfed207d96aba169c6da07fa26d57781f5f93
2017-01-25 21:32:16 +00:00
Jerry Zhang
86d39a602c Clean up persistent usb state on boot. am: bfc5d563aa -s ours
am: 6cf9bfde00

Change-Id: If911ea57fe1259029c0825d4a697f0098692f07d
2017-01-25 21:31:24 +00:00
Android Build Merger (Role)
7fef16ff24 Merge "Merge changes from topic 'usb_bugfix' into nyc-mr2-dev am: 55772c73c0" into nyc-mr2-dev-plus-aosp 2017-01-25 21:31:12 +00:00
Jerry Zhang
469fc8cb94 Fixed handling of usb state during adb changes. am: 541295a9a5 -s ours
am: e5a8b4f12c

Change-Id: Iabd888a924226e0a333fe0600daf4bec154eb832
2017-01-25 21:30:08 +00:00
Jerry Zhang
473e3953f5 Merge changes from topic 'usb_bugfix' into nyc-mr2-dev
am: 55772c73c0

Change-Id: Ie41c7e8b7a687e9836354d429e66b5f214a6d0b2
2017-01-25 21:30:07 +00:00
Josh Gao
0ebf87e3e7 Merge "zygote: don't drop CAP_SYS_PTRACE from the bounding set." am: 273b886c49 am: e801810553
am: a07e5312cc

Change-Id: I9165a6dc33058ec4f7bd8a6c6f4426af405bda19
2017-01-25 21:30:03 +00:00
Josh Gao
a07e5312cc Merge "zygote: don't drop CAP_SYS_PTRACE from the bounding set." am: 273b886c49
am: e801810553

Change-Id: I636c0f021c6ffae4518d889b1e7c4c3c29c6e864
2017-01-25 21:25:23 +00:00
Jerry Zhang
270c4bcd86 Refactored setCurrentFunction and setUsbDataUnlocked into single method.
am: 4882496232  -s ours

Change-Id: Ia50fbb88cdaa9e3570b68798b82df609475b5fe6
2017-01-25 21:23:54 +00:00
Jerry Zhang
6cf9bfde00 Clean up persistent usb state on boot.
am: bfc5d563aa  -s ours

Change-Id: Idd46b3f5a0c3a608a3178855b67afbce1cf21acb
2017-01-25 21:22:54 +00:00
Jerry Zhang
e5a8b4f12c Fixed handling of usb state during adb changes.
am: 541295a9a5  -s ours

Change-Id: I608202f6c74d0209f5507f838f103f874ed47e3b
2017-01-25 21:22:07 +00:00
Josh Gao
e801810553 Merge "zygote: don't drop CAP_SYS_PTRACE from the bounding set."
am: 273b886c49

Change-Id: I82c58cd03c8db78a1733ba5070d314607475cee7
2017-01-25 21:21:29 +00:00
phweiss
73145f4e60 Create public API for policy transparency outside of Settings
The new DPM.createAdminSupportIntent() returns an intent that shows the
"This action was disabled by your admin"-dialog from settings.
This enables apps to inform the user about the cause of restricted
functionality.

A new extra for the intent allows to specialize the dialog for different
restricted features, instead of a generic message for all features.

Bug: 31215663
Test: runtest -c com.android.server.devicepolicy.DevicePolicyManagerTest frameworks-services

Change-Id: I3de7aeec0f88b8f013a63957aec803cd123fbedc
2017-01-25 22:20:46 +01:00
Sundeep Ghuman
bf339f5cc5 Add logging for badges shown in WifiSettings.
Bug: 34394557
Test: GmsCore Debug logs (see tron howto).
Change-Id: I14f28278a9478e9ead891e25b1bec54ffa9d90ef
2017-01-25 13:20:40 -08:00
Josh Gao
273b886c49 Merge "zygote: don't drop CAP_SYS_PTRACE from the bounding set." 2017-01-25 21:16:58 +00:00
Dianne Hackborn
c5d458930c Merge "Add some new experiment constants for activity and power manager." 2017-01-25 21:12:12 +00:00
Shuzhen Wang
b44dee8e22 Merge "Camera2: Handle (0, 0) size for deferred OutputConfiguration" 2017-01-25 21:05:45 +00:00
Abodunrinwa Toki
e363f427f8 Merge "Implement TextClassifierImpl.getLinks" 2017-01-25 21:05:03 +00:00
Winson Chung
8779446466 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
2017-01-25 21:03:59 +00:00
Felipe Leme
436ab6a91d Added support to authentication.
AutoFillService can now require user authentication, both at
FillResponse and Dataset levels;
- FillResponse authentication is typically used when the user data
  need to be unlocked before the first use.
- Dataset authentication is typically used to unlock sensitive data
  such as credit card info.

The authentication can be handled by the service itself (for example,
when it uses the credit card CVV to unlock it) or by the Android
system (when the service asks for fingerprint authentication).

Bug: 31001899

Test: manual verification
Test: CtsAutoFillServiceTestCases passes

Change-Id: If62f42f697ab5ef0d14d991ff1077d1c38808e61
2017-01-25 13:03:32 -08:00
Andy Hung
ebc2c14b07 AudioTrack: Enable deep buffer mode from Java
Test: AudioTrack CTS test, Play Movies
Bug: 30687201
Change-Id: Id3a8d675966671ed13c488936228bd76dfc6c1fe
2017-01-25 13:00:34 -08:00
Steve McKay
24cd592b24 DO NOT MERGE: Allow launcher icon to be config'd in overlay.
Bug: 34441010
Test: Build and view in launcher.
Change-Id: I1f6cb4f2f6cb234e55aac1657aa6cdaa4a22550f
2017-01-25 20:41:14 +00:00
Mady Mellor
3e6552036e Add snooze listener so that a plugin can snooze a notification
Test: manual
Change-Id: Ieb3c0fcae6d832c3e8f5d1b983c52cf4f2ff6239
2017-01-25 12:34:22 -08:00
Mady Mellor
87d7945f06 Change NotificationGuts to contain a view
NotificationGuts is now given a view to display, the notification
management controls have been moved into their own view.

NotificationGuts is provided a view to show via a MenuItem.

This allows configuration via the NotificationMenuRowProvider Plugin.

Test: manual
Change-Id: I68cb23ea2cada30cc6e930fa8c03e0aa4014dfe2
2017-01-25 12:34:11 -08:00
Jerry Zhang
55772c73c0 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.
2017-01-25 20:30:22 +00:00
chchao
b8e253a229 Create metrics for toggling Select to Speak service in SetupWizard.
Bug: 29517229
Test: manual
Test: compile framework
Change-Id: I1306a16a88b6bac2b4c53f6e9b5883dfdb36cedb
2017-01-25 12:29:36 -08:00
John Reck
2de950d5a8 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
2017-01-25 12:24:40 -08:00
George Burgess IV
85895792f0 Merge "Fix a use-of-uninitialized-value warning." am: 500cf67206 am: f77f2cb3e7 am: 0c6283e396
am: 858852a6dc

Change-Id: Ib874408eb77d265a9e939679bd2c5459217063e8
2017-01-25 20:23:58 +00:00
Mady Mellor
761cde1173 Rename notification settings icon row / gear to notification menu row
Test: manual
Change-Id: I3a84c5ea180bd1e53495c5a44a93fa1982056174
2017-01-25 12:23:36 -08:00
Mady Mellor
43c2cd1a40 Create + implement plugin for NotificationSettingsIconRow
This will allow plugins to supply additional menu options to the
menu "behind" a notification.

This CL does not include behavior for when one of these new menu
items is tapped, this will be added in a separate CL.

Test: manual
Change-Id: I322f9f39d33b043bd23dcbede5dd15e6afa73fc1
2017-01-25 12:23:29 -08:00
Shuzhen Wang
e56e606f82 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
2017-01-25 12:22:01 -08:00
Mark Rathjen
8bd8564a18 Merge "Resolve Android security comments for Android ID migration." 2017-01-25 20:20:29 +00:00
TreeHugger Robot
a92c180107 Merge "Also parse "1" as true for ContentValues#getAsBoolean" 2017-01-25 20:19:11 +00:00
George Burgess IV
858852a6dc Merge "Fix a use-of-uninitialized-value warning." am: 500cf67206 am: f77f2cb3e7
am: 0c6283e396

Change-Id: Ife5d9444f9036c16540bd7bf7a1c0e17cf296df5
2017-01-25 20:19:05 +00:00
George Burgess IV
0c6283e396 Merge "Fix a use-of-uninitialized-value warning." am: 500cf67206
am: f77f2cb3e7

Change-Id: I44e23c5689b51ae002a8db71a537ab97d3f31121
2017-01-25 20:14:00 +00:00
Android Build Merger (Role)
73c945de33 Merge "Merge "nfc: Make NDEF validation stricter" am: f3a6269fed am: e6cb2aa614 am: 40c14a83d0 am: deac669a53" 2017-01-25 20:13:03 +00:00
TreeHugger Robot
260dedceda Merge "[clipboard] Clipboard sharing" 2017-01-25 20:12:17 +00:00
Ruchi Kandoi
2a13fbae73 Merge "nfc: Make NDEF validation stricter" am: f3a6269fed am: e6cb2aa614 am: 40c14a83d0
am: deac669a53

Change-Id: I208e9c5d6fbbfa9f3a6c0d43f38fcacc040ccb92
2017-01-25 20:12:06 +00:00
George Burgess IV
f77f2cb3e7 Merge "Fix a use-of-uninitialized-value warning."
am: 500cf67206

Change-Id: I8b171a90696e09c42a1506255bc4c0056f69f35c
2017-01-25 20:09:26 +00:00
Ruchi Kandoi
deac669a53 Merge "nfc: Make NDEF validation stricter" am: f3a6269fed am: e6cb2aa614
am: 40c14a83d0

Change-Id: I7ef55eddac20d58e9184056e85c9b49e733fd38d
2017-01-25 20:07:23 +00:00
Josh Gao
59972218f8 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
2017-01-25 12:03:02 -08:00
Ruchi Kandoi
40c14a83d0 Merge "nfc: Make NDEF validation stricter" am: f3a6269fed
am: e6cb2aa614

Change-Id: Ib069a18f16850d419b6c10c3b80e80115d9d8fc8
2017-01-25 20:03:00 +00:00
Treehugger Robot
500cf67206 Merge "Fix a use-of-uninitialized-value warning." 2017-01-25 20:01:34 +00:00
Ruchi Kandoi
e6cb2aa614 Merge "nfc: Make NDEF validation stricter"
am: f3a6269fed

Change-Id: If69e586c81e5926c0795af3689de67b260891eaa
2017-01-25 19:59:16 +00:00
Rubin Xu
1b60614ae9 Merge "Fix build breakage" 2017-01-25 19:56:40 +00:00
Adrian Roos
7b9ed0d8fd DirectReply: Show historic messages
Test: Post notification with MessagingStyle.addHistoricMessage(), verify they show up while direct replying.
Change-Id: I26b801d05305a5251fe0d6fae1fe1c24064105a9
2017-01-25 11:56:32 -08:00
Amith Yamasani
801e342faa Don't return self if not a profile
This fixes the inconsistency between no profile and a
removed profile.

Change-Id: I85d37ce42113bde8567be382372c5f4997601e85
Fixes: 34699518
Test: runtest -x
frameworks/base/services/tests/servicetests/src/com/android/server/pm/UserManagerTest.java
2017-01-25 11:55:51 -08:00
Jason Monk
d5e96800d2 Merge "Fix up the tests (yet again)" 2017-01-25 19:55:37 +00:00