OSDN Git Service
Android Build Merger (Role) [Thu, 26 Jan 2017 04:50:14 +0000 (04:50 +0000)]
Merge "Fix @links in reference docs. am:
54de77470d am:
ab978c035e am:
28ba4722a9 am:
9b21265b2c"
Elliot Waite [Thu, 26 Jan 2017 04:49:33 +0000 (04:49 +0000)]
Fix @links in reference docs. am:
54de77470d am:
ab978c035e am:
28ba4722a9
am:
9b21265b2c
Change-Id: If246ebdb36cf2832d5a6c42cbe752e290b6fb6e8
TreeHugger Robot [Thu, 26 Jan 2017 04:49:29 +0000 (04:49 +0000)]
Merge "Add notification channel groups."
Pavlin Radoslavov [Thu, 26 Jan 2017 04:45:45 +0000 (04:45 +0000)]
Merge "Fix wording ambiguity for Bluetooth LDAC Playback Quality selection" am:
0645c21163 am:
b3f1eaa504 am:
e667f7795f
am:
0946c26b39
Change-Id: Idd92101991a52af343a8479ef944a8396f4ab887
Elliot Waite [Thu, 26 Jan 2017 04:44:54 +0000 (04:44 +0000)]
Fix @links in reference docs. am:
54de77470d am:
ab978c035e
am:
28ba4722a9
Change-Id: I98177a8cf0a20677e140406bb7371474ca259e5b
Steve McKay [Thu, 26 Jan 2017 04:44:46 +0000 (04:44 +0000)]
Merge "DO NOT MERGE: Allow launcher icon to be config'd in overlay." into nyc-mr2-dev am:
32e6da5b84
am:
ea02035c4d -s ours
Change-Id: I8c9cbbf10e1058180bdbb127d9657c4f6fe9c886
Steve McKay [Thu, 26 Jan 2017 04:41:50 +0000 (04:41 +0000)]
DO NOT MERGE: Allow launcher icon to be config'd in overlay. am:
24cd592b24
am:
1552895f55 -s ours
Change-Id: Ic8916aee1861f93883c51afe9da1b09a7eb1a467
Pavlin Radoslavov [Thu, 26 Jan 2017 04:40:43 +0000 (04:40 +0000)]
Merge "Fix wording ambiguity for Bluetooth LDAC Playback Quality selection" am:
0645c21163 am:
b3f1eaa504
am:
e667f7795f
Change-Id: Ia6722702175e196d5b980ec7be3a093e972cfbfb
Elliot Waite [Thu, 26 Jan 2017 04:39:57 +0000 (04:39 +0000)]
Fix @links in reference docs. am:
54de77470d
am:
ab978c035e
Change-Id: If0d0613362e0ea95cf48eaf9a16d3eea48b589ea
Steve McKay [Thu, 26 Jan 2017 04:38:25 +0000 (04:38 +0000)]
Merge "DO NOT MERGE: Allow launcher icon to be config'd in overlay." into nyc-mr2-dev
am:
32e6da5b84
Change-Id: I7a90eb649be34b2f99af885ad4559fa9e1d5f727
Elliot Waite [Thu, 26 Jan 2017 04:37:34 +0000 (04:37 +0000)]
Merge "Fix @see tag."
Steve McKay [Thu, 26 Jan 2017 04:35:46 +0000 (04:35 +0000)]
DO NOT MERGE: Allow launcher icon to be config'd in overlay.
am:
24cd592b24
Change-Id: Id9f70ccb67f48c4b4b290fd493f3e7725f1b7a5b
Pavlin Radoslavov [Thu, 26 Jan 2017 04:34:57 +0000 (04:34 +0000)]
Merge "Fix wording ambiguity for Bluetooth LDAC Playback Quality selection" am:
0645c21163
am:
b3f1eaa504
Change-Id: Ie1f0e958b93bfb898a7fdbe3ed8f732190a3e7ac
Elliot Waite [Thu, 26 Jan 2017 04:34:57 +0000 (04:34 +0000)]
Fix @links in reference docs.
am:
54de77470d
Change-Id: Id38c30bad13d6b61ed504a06471b9f197b360f7b
TreeHugger Robot [Thu, 26 Jan 2017 04:31:36 +0000 (04:31 +0000)]
Merge "DO NOT MERGE: Allow launcher icon to be config'd in overlay." into nyc-mr2-dev
Pavlin Radoslavov [Thu, 26 Jan 2017 04:29:57 +0000 (04:29 +0000)]
Merge "Fix wording ambiguity for Bluetooth LDAC Playback Quality selection"
am:
0645c21163
Change-Id: I66a7a5f8dc423c7999b4e0a39a272a837e66c847
Treehugger Robot [Thu, 26 Jan 2017 04:23:42 +0000 (04:23 +0000)]
Merge "Fix wording ambiguity for Bluetooth LDAC Playback Quality selection"
TreeHugger Robot [Thu, 26 Jan 2017 03:57:40 +0000 (03:57 +0000)]
Merge "Don't return self if not a profile"
TreeHugger Robot [Thu, 26 Jan 2017 03:38:06 +0000 (03:38 +0000)]
Merge "Updates to the cache filtering impl."
Ta-wei Yen [Thu, 26 Jan 2017 03:33:30 +0000 (03:33 +0000)]
Merge "Add getVisualVoicemailPackageName() Make NMR2 voicemail columns public"
Jason Monk [Thu, 26 Jan 2017 03:23:28 +0000 (03:23 +0000)]
Merge "Tuner: Allow lockscreen launch targets to be customized"
Jorim Jaggi [Thu, 26 Jan 2017 02:24:40 +0000 (02:24 +0000)]
Merge "Flip task snapshot flag"
Jason Monk [Thu, 26 Jan 2017 02:23:02 +0000 (02:23 +0000)]
Merge "Tuner: Nav bar tuner"
TreeHugger Robot [Thu, 26 Jan 2017 02:06:03 +0000 (02:06 +0000)]
Merge changes I818e8db9,Ie24468be
* changes:
Added a new API to colorize notifications
Modified the interpolators when opening an ambient notification
Hakan Seyalioglu [Thu, 26 Jan 2017 02:02:29 +0000 (02:02 +0000)]
Merge "Mark two test methods public so they can be mocked"
Brad Ebinger [Thu, 26 Jan 2017 01:56:25 +0000 (01:56 +0000)]
Merge "Adding Dynamic ImsService Binding (1/3)" am:
8e6b13a1c0 am:
64057ab972 am:
2741442324
am:
ded1df24e0
Change-Id: Ifd95efa076b7f5c8c8b02be7688aab1008bbc63c
Brad Ebinger [Thu, 26 Jan 2017 01:49:53 +0000 (01:49 +0000)]
Merge "Adding Dynamic ImsService Binding (1/3)" am:
8e6b13a1c0 am:
64057ab972
am:
2741442324
Change-Id: Ibd5c988226e7994c332a7e7f8b40a9338cf84e0f
Brad Ebinger [Thu, 26 Jan 2017 01:46:06 +0000 (01:46 +0000)]
Merge "Adding Dynamic ImsService Binding (1/3)" am:
8e6b13a1c0
am:
64057ab972
Change-Id: I901c72a38b522c190e849de55078036adc80d8b6
TreeHugger Robot [Thu, 26 Jan 2017 01:44:08 +0000 (01:44 +0000)]
Merge "Add APIs to hide voicemail settings."
TreeHugger Robot [Thu, 26 Jan 2017 01:43:35 +0000 (01:43 +0000)]
Merge "DirectReply: Show historic messages"
Brad Ebinger [Thu, 26 Jan 2017 01:41:38 +0000 (01:41 +0000)]
Merge "Adding Dynamic ImsService Binding (1/3)"
am:
8e6b13a1c0
Change-Id: I8534273da5579b7662e66f80a60348a4665dd65b
TreeHugger Robot [Thu, 26 Jan 2017 01:35:34 +0000 (01:35 +0000)]
Merge "Added support to authentication."
Treehugger Robot [Thu, 26 Jan 2017 01:34:04 +0000 (01:34 +0000)]
Merge "Adding Dynamic ImsService Binding (1/3)"
Philipp Weiß [Thu, 26 Jan 2017 01:25:21 +0000 (01:25 +0000)]
Merge "Create public API for policy transparency outside of Settings"
Elliot Waite [Wed, 25 Jan 2017 23:22:55 +0000 (15:22 -0800)]
Fix @see tag.
Test: make ds-docs
Change-Id: Iefdc92a7139155eccca11a5393da6f31d8603322
TreeHugger Robot [Thu, 26 Jan 2017 01:23:22 +0000 (01:23 +0000)]
Merge "camera: Add enableZsl key"
Jason Monk [Wed, 25 Jan 2017 23:26:50 +0000 (18:26 -0500)]
Tuner: Allow lockscreen launch targets to be customized
Visuals need SIGNIFICANT WORK. Otherwise seems good.
Test: Manual
Change-Id: I911217aca6dba41bf1b49fc3dd19cbfef443e6bd
Elliot Waite [Wed, 11 Jan 2017 23:30:35 +0000 (15:30 -0800)]
Fix @links in reference docs.
Change-Id: I40cea46efd80c448640ff69753698fe8404da40b
TreeHugger Robot [Thu, 26 Jan 2017 00:59:17 +0000 (00:59 +0000)]
Merge "Create an API for retrieving a badged wifi icon."
Mady Mellor [Thu, 26 Jan 2017 00:49:11 +0000 (00:49 +0000)]
Merge changes from topic 'nmr-plugin'
* changes:
Add snooze to notification menu row
Add snooze listener so that a plugin can snooze a notification
Change NotificationGuts to contain a view
Rename notification settings icon row / gear to notification menu row
Create + implement plugin for NotificationSettingsIconRow
Sundeep Ghuman [Thu, 26 Jan 2017 00:31:30 +0000 (00:31 +0000)]
Merge "Add logging for badges shown in WifiSettings."
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
TreeHugger Robot [Thu, 26 Jan 2017 00:22:49 +0000 (00:22 +0000)]
Merge "AudioTrack: Enable deep buffer mode from Java"
Chao Chen [Thu, 26 Jan 2017 00:18:32 +0000 (00:18 +0000)]
Merge "Create metrics for toggling Select to Speak service in SetupWizard."
Julia Reynolds [Wed, 25 Jan 2017 22:42:53 +0000 (17:42 -0500)]
Add notification channel groups.
Test: runtest systemui-notification, cts
Change-Id: I3ed82f2b20d3f791b7cae379a49373cb41231739
Selim Cinek [Fri, 20 Jan 2017 01:36:00 +0000 (17:36 -0800)]
Added a new API to colorize notifications
Ongoing notifications can now be colorized.
This will use the color provided as the background
and invert most text colors
Test: runtest -x cts/tests/app/src/android/app/cts/NotificationTest.java
Bug:
34469375
Change-Id: I818e8db96c868d8bcde8f28c253efd581eeccaa2
Brad Ebinger [Mon, 23 Jan 2017 23:17:50 +0000 (15:17 -0800)]
Adding Dynamic ImsService Binding (1/3)
Adds support for dynamic ImsService Binding (change 1/3). Included
in this change:
- AIDLs for ImsServiceController
- ImsFeature/ImsServiceBase definitions
- KEY_CONFIG_IMS_PACKAGE_OVERRIDE CarrierConfig option
Test: Unit Tests in opt/telephony
Bug:
30290416
Change-Id: Ic4cb1d85a29681b08a6a525c588a72209862dcc3
John Reck [Wed, 25 Jan 2017 23:11:26 +0000 (23:11 +0000)]
Merge "Overhaul RenderNode's DisplayList management"
Selim Cinek [Thu, 19 Jan 2017 19:54:04 +0000 (11:54 -0800)]
Modified the interpolators when opening an ambient notification
Change-Id: Ie24468be028fd7c894840e3d1fbf42717ad387a4
Test: add low-priority notification and expand
Bug:
34469375
Pavlin Radoslavov [Wed, 25 Jan 2017 22:00:02 +0000 (14:00 -0800)]
Fix wording ambiguity for Bluetooth LDAC Playback Quality selection
"Optimize for" -> "Optimized for"
Bug:
34687041
Test: UI Visual inspection
Change-Id: I112ed6451465750978181e6ee35f96fd76969e9c
Ta-wei Yen [Wed, 25 Jan 2017 02:23:00 +0000 (18:23 -0800)]
Add APIs to hide voicemail settings.
With unbundle visual voicemail and dialer voicemail notification, the
dialer should be able to control the voicemail settings, and refer
telephony settings as "Advance settings" only showing the options
not in the public API.
This CL gives the default dialer the ability to hide duplicated
settings in telephony.
Bug:
34691905
Fixes
34691905
Test: CTS verifier test "hide public settings in voicemail"
"hide voicemail in call settings"
Change-Id: I6589c3d77b5075265cf013ee56524a342904ecd1
TreeHugger Robot [Wed, 25 Jan 2017 21:53:29 +0000 (21:53 +0000)]
Merge "mediaplayer: add buffering settings API"
Mady Mellor [Wed, 25 Jan 2017 21:16:03 +0000 (13:16 -0800)]
Add snooze to notification menu row
Moves the snooze plugin code into system UI.
Does not include assistant suggestions.
Test: manual
Change-Id: Ie2c51d65381530c9a72cd8a871efdbf0d63da490
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
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
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
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
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
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
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
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
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
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
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
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
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
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
phweiss [Tue, 17 Jan 2017 18:06:38 +0000 (19:06 +0100)]
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
Sundeep Ghuman [Mon, 23 Jan 2017 23:41:43 +0000 (15:41 -0800)]
Add logging for badges shown in WifiSettings.
Bug:
34394557
Test: GmsCore Debug logs (see tron howto).
Change-Id: I14f28278a9478e9ead891e25b1bec54ffa9d90ef
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."
Dianne Hackborn [Wed, 25 Jan 2017 21:12:09 +0000 (21:12 +0000)]
Merge "Add some new experiment constants for activity and power manager."
Shuzhen Wang [Wed, 25 Jan 2017 21:05:42 +0000 (21:05 +0000)]
Merge "Camera2: Handle (0, 0) size for deferred OutputConfiguration"
Abodunrinwa Toki [Wed, 25 Jan 2017 21:04:59 +0000 (21:04 +0000)]
Merge "Implement TextClassifierImpl.getLinks"
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
Felipe Leme [Thu, 15 Dec 2016 19:56:15 +0000 (11:56 -0800)]
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
Andy Hung [Fri, 13 Jan 2017 03:20:29 +0000 (19:20 -0800)]
AudioTrack: Enable deep buffer mode from Java
Test: AudioTrack CTS test, Play Movies
Bug:
30687201
Change-Id: Id3a8d675966671ed13c488936228bd76dfc6c1fe
Steve McKay [Wed, 25 Jan 2017 18:19:06 +0000 (10:19 -0800)]
DO NOT MERGE: Allow launcher icon to be config'd in overlay.
Bug:
34441010
Test: Build and view in launcher.
Change-Id: I1f6cb4f2f6cb234e55aac1657aa6cdaa4a22550f
Mady Mellor [Wed, 11 Jan 2017 00:37:22 +0000 (16:37 -0800)]
Add snooze listener so that a plugin can snooze a notification
Test: manual
Change-Id: Ieb3c0fcae6d832c3e8f5d1b983c52cf4f2ff6239
Mady Mellor [Tue, 10 Jan 2017 19:52:52 +0000 (11:52 -0800)]
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
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.
chchao [Wed, 25 Jan 2017 20:12:09 +0000 (12:12 -0800)]
Create metrics for toggling Select to Speak service in SetupWizard.
Bug:
29517229
Test: manual
Test: compile framework
Change-Id: I1306a16a88b6bac2b4c53f6e9b5883dfdb36cedb
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
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
Mady Mellor [Tue, 10 Jan 2017 19:36:39 +0000 (11:36 -0800)]
Rename notification settings icon row / gear to notification menu row
Test: manual
Change-Id: I3a84c5ea180bd1e53495c5a44a93fa1982056174
Mady Mellor [Tue, 13 Dec 2016 05:05:13 +0000 (21:05 -0800)]
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
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
Mark Rathjen [Wed, 25 Jan 2017 20:20:26 +0000 (20:20 +0000)]
Merge "Resolve Android security comments for Android ID migration."
TreeHugger Robot [Wed, 25 Jan 2017 20:19:05 +0000 (20:19 +0000)]
Merge "Also parse "1" as true for ContentValues#getAsBoolean"
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
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
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"
TreeHugger Robot [Wed, 25 Jan 2017 20:12:13 +0000 (20:12 +0000)]
Merge "[clipboard] Clipboard sharing"
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
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
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
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
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
Treehugger Robot [Wed, 25 Jan 2017 20:01:33 +0000 (20:01 +0000)]
Merge "Fix a use-of-uninitialized-value warning."
Ruchi Kandoi [Wed, 25 Jan 2017 19:59:16 +0000 (19:59 +0000)]
Merge "nfc: Make NDEF validation stricter"
am:
f3a6269fed
Change-Id: If69e586c81e5926c0795af3689de67b260891eaa
Rubin Xu [Wed, 25 Jan 2017 19:56:37 +0000 (19:56 +0000)]
Merge "Fix build breakage"