OSDN Git Service
Julius D'souza [Thu, 6 Apr 2017 14:19:58 +0000 (14:19 +0000)]
Document Android Wear usage of KEYCODE_WINDOW. am:
03d4a65865
am:
137006ff5c
Change-Id: I40ba20230d36bfe7b1f397b822f2122172de9da3
Julius D'souza [Thu, 6 Apr 2017 14:12:46 +0000 (14:12 +0000)]
Document Android Wear usage of KEYCODE_WINDOW.
am:
03d4a65865
Change-Id: If938e79a9eddcf3cec97274ad305834c2d58386e
TreeHugger Robot [Thu, 6 Apr 2017 14:02:06 +0000 (14:02 +0000)]
Merge "Camera: Initial support for vendor tag caches" into oc-dev
TreeHugger Robot [Thu, 6 Apr 2017 13:24:45 +0000 (13:24 +0000)]
Merge "Do not stop lock task if it is starting background user" into oc-dev
Neil Fuller [Wed, 5 Apr 2017 12:58:26 +0000 (13:58 +0100)]
Canonicalize tz IDs when finding exemplar location
Canonicalize time zone IDs when looking up exemplar location.
ICU's canonical IDs are not guaranteed the same as IANA's.
Various data files (e.g. timezones.xml, tzdata,
time_zones_by_country.xml) are using IANA IDs. ICU's IDs
are often the same, but because they are guaranteed not to
change and IANAs are not there is some drift.
This fixes an issue with the settings picker for ICU IDs:
America/Buenos_Aires
Asia/Rangoon
Asia/Katmandu
Asia/Calcutta
Which are IANA's:
America/Argentina/Buenos_Aires
Asia/Yangon
Asia/Kathmandu
Asia/Kolkata
introduced by commit
b4d003da66.
It could also influence some display names for
automatically-selected time zones outside of this list.
The issues was particularly noticeable in locales that
use non-ASCII scripts; ICU performs a fallback if the ID
isn't canonical and would transform and return the last
part of the ID (e.g. Buenos Aires, Yangon, Kathmandu,
Kolkata).
Bug:
36469833
Test: Manual testing in Japanese
Change-Id: I2febdbee58e474d251d0a33f2c8335664a74581f
(cherry picked from commit
f92ad8a0190add07779ed454a0908dd3df83f4bd)
TreeHugger Robot [Thu, 6 Apr 2017 06:23:59 +0000 (06:23 +0000)]
Merge "Pass FillResponse bundle on subsequent onFillRequest() calls." into oc-dev
TreeHugger Robot [Thu, 6 Apr 2017 06:22:08 +0000 (06:22 +0000)]
Merge "Overlay a highlight over autofilled views" into oc-dev
TreeHugger Robot [Thu, 6 Apr 2017 06:21:03 +0000 (06:21 +0000)]
Merge "Clarify MediaDrm#getKeyRequest docs: init and mimeType" into oc-dev
TreeHugger Robot [Thu, 6 Apr 2017 06:06:48 +0000 (06:06 +0000)]
Merge "Update MediaDrm documentation for provideKeyResponse" into oc-dev
TreeHugger Robot [Thu, 6 Apr 2017 05:20:11 +0000 (05:20 +0000)]
Merge "Fix anchor overlap handling in ListPopupWindow" into oc-dev
TreeHugger Robot [Thu, 6 Apr 2017 04:54:44 +0000 (04:54 +0000)]
Merge "Partially revert "Add blocking and retrying wrappers for INetd uses."" into oc-dev
TreeHugger Robot [Thu, 6 Apr 2017 04:23:02 +0000 (04:23 +0000)]
Merge "Set AccessPoint metered bit using ScoredNetwork, WifiInfo, and WifiConfiguration." into oc-dev
Philip P. Moltmann [Mon, 27 Mar 2017 16:55:30 +0000 (09:55 -0700)]
Overlay a highlight over autofilled views
Also clear this overlay once the data changes. Some views call
notifyValueUpdated even if the value did not change. Hence remeber the
data that was autofilled and check if the data really changed.
Make the autofilledDrawable publicly accessible so that virtual views
can use the same UI.
As the activity is not aware that the views were autofilled the state
has to be explicitly persisted over activity lifecycle events as part
of the view. The lifecyle does not work yet as the AutofillIds are not
stable over activity lifecycle events.
Fixes:
34946006
Test: Autofilled and changed all supported views.
cts-tradefed run cts-dev -m CtsUiRenderingTestCases
Change-Id: I58b105bb221f1b6466dd136dfe5062d3babb5aa8
Ray Essick [Thu, 6 Apr 2017 03:09:18 +0000 (03:09 +0000)]
Merge "Move MediaMetrics into its own library" into oc-dev
Joel Scherpelz [Thu, 30 Mar 2017 01:13:03 +0000 (01:13 +0000)]
Partially revert "Add blocking and retrying wrappers for INetd uses."
Direct access to Netd from the bluetooth process is disallowed by
SELinux policy. This change reverts to the old behavior where IpManager
interacts with NetdService indirectly via NetworkManagementService.
Test: as follows:
- built (sailfish)
- flashed
- booted
- established bluetooth tethering to another device, ping'd 8.8.8.8
Bug:
36492299
This partially reverts commit
af39244a34f4449c12a5f925222c9bc8d8049320.
Change-Id: Icf20b1e24abf7dd3123760f8637928bde7afe06b
TreeHugger Robot [Thu, 6 Apr 2017 02:38:52 +0000 (02:38 +0000)]
Merge "BatteryStats: Remove too-verbose logging" into oc-dev
Felipe Leme [Tue, 4 Apr 2017 20:10:58 +0000 (13:10 -0700)]
Pass FillResponse bundle on subsequent onFillRequest() calls.
BUG:
35707731
Test: existing CtsAutoFillServiceTestCases pass
Test: more tests on PartitionedActivityTest
Change-Id: I510aff54d0d9d7e0cce90f9786e3e1f6cab180f9
TreeHugger Robot [Thu, 6 Apr 2017 02:26:32 +0000 (02:26 +0000)]
Merge "Improvements on ViewNodes received on partitioned requests:" into oc-dev
Stephen Chen [Tue, 4 Apr 2017 20:23:31 +0000 (13:23 -0700)]
Set AccessPoint metered bit using ScoredNetwork, WifiInfo, and WifiConfiguration.
Bug:
36888471
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
Change-Id: I5228512a832665916520658acddc9bf93d78a1a1
TreeHugger Robot [Thu, 6 Apr 2017 01:53:53 +0000 (01:53 +0000)]
Merge "Make print failure notifications important" into oc-dev
Santos Cordon [Thu, 6 Apr 2017 01:48:06 +0000 (01:48 +0000)]
Merge "Remove SystemProperty gating-flag for virtual displays." into oc-dev
TreeHugger Robot [Thu, 6 Apr 2017 01:41:47 +0000 (01:41 +0000)]
Merge "Don't call the Package Manager when holding the settings lock" into oc-dev
Nathan Harold [Thu, 6 Apr 2017 01:34:32 +0000 (01:34 +0000)]
Merge changes from topic 'ipsec-svc-pick' into oc-dev
* changes:
Fix Log Traces for IpSecService
SystemServer: fix StartIpSecService trace and log
Add Initial IPsec APIs to IpSecService
IpSecManager and IpSecTransform API Cleanup
Change reserveSecurityParameterIndex() to take a remoteAddress
Add a Skeleton IpSecService
TreeHugger Robot [Thu, 6 Apr 2017 01:13:06 +0000 (01:13 +0000)]
Merge "Save FragmentManagerNonConfig during onSaveInstanceState()" into oc-dev
TreeHugger Robot [Thu, 6 Apr 2017 01:05:01 +0000 (01:05 +0000)]
Merge "Fixed the obsolete logging" into oc-dev
Adam Lesinski [Thu, 6 Apr 2017 00:54:13 +0000 (17:54 -0700)]
BatteryStats: Remove too-verbose logging
Bug:
36972594
Test: manual
Change-Id: I02976ed924550f73010a453d207d199b13307cfa
Felipe Leme [Sat, 1 Apr 2017 00:26:34 +0000 (17:26 -0700)]
Improvements on ViewNodes received on partitioned requests:
- Fixed focus
- Added autofillValue for nodes previously autofilled
BUG:
35707731
Test: existing CtsAutoFillServiceTestCases pass
Test: more tests on PartitionedActivityTest
Change-Id: If4390d002d44c82e3de0339a634041f3998e804e
TreeHugger Robot [Thu, 6 Apr 2017 00:15:23 +0000 (00:15 +0000)]
Merge "Created SaveInfo types for email and username." into oc-dev
TreeHugger Robot [Thu, 6 Apr 2017 00:13:22 +0000 (00:13 +0000)]
Merge "Change getFragments() to return a List." into oc-dev
Christopher Tate [Wed, 5 Apr 2017 23:34:07 +0000 (16:34 -0700)]
Don't call the Package Manager when holding the settings lock
The package manager sometimes has to call into the settings provider with
its own lock held in the course of processing queries, so it's vitally
important not to call into it with the settings provider's internal lock
already held.
In this case, the SSAID lazy-generation path was fetching the signatures
of the calling package from inside the settings lock. Now it doesn't.
Bug
36863412
Test: manual
Change-Id: Ic9d53397b5bddb883c5d73aff253ca280a5e93c0
Peng Xu [Thu, 6 Apr 2017 00:00:07 +0000 (00:00 +0000)]
Merge "Local geomagnetic field update to sensor" into oc-dev
Adam Bookatz [Wed, 5 Apr 2017 23:56:56 +0000 (23:56 +0000)]
Merge "Change wifiScanActualTime csv from usec to msec" into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 23:56:21 +0000 (23:56 +0000)]
Merge "Dump autofill service component from settings." into oc-dev
Philip P. Moltmann [Wed, 5 Apr 2017 23:46:50 +0000 (16:46 -0700)]
Make print failure notifications important
Before failures and progress was similar important. Both were not shown.
Now both are shown and the failures alert.
Removed the notification grouping as autogrouping is good enough.
Test: Created failed and running print jobs
Change-Id: I6dfca583d69aa9713d45a2bc52d05e95f06b376f
TreeHugger Robot [Wed, 5 Apr 2017 23:44:56 +0000 (23:44 +0000)]
Merge "Serialize visibleToInstantApps" into oc-dev
Winson Chung [Wed, 5 Apr 2017 23:36:30 +0000 (23:36 +0000)]
Merge "Workaround for input ANR, always finish PiP menu activity." into oc-dev
Selim Cinek [Wed, 5 Apr 2017 23:35:54 +0000 (23:35 +0000)]
Merge "Fixed that the icon could dissappear" into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 23:32:50 +0000 (23:32 +0000)]
Merge "Use text input for various internationalized listeners" into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 23:29:22 +0000 (23:29 +0000)]
Merge "Don't show empty account list in account chooser." into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 23:23:50 +0000 (23:23 +0000)]
Merge "Call noteStateNotSaved on child fragment managers." into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 23:11:38 +0000 (23:11 +0000)]
Merge "don't honour domain verification for browsers" into oc-dev
Felipe Leme [Wed, 5 Apr 2017 22:25:08 +0000 (22:25 +0000)]
Merge "Changed FillResponse.setAuthentication() to require field ids." into oc-dev
Vladislav Kaznacheev [Wed, 5 Apr 2017 22:22:10 +0000 (15:22 -0700)]
Fix anchor overlap handling in ListPopupWindow
Do not change anchor overlap on the underlying
PopupWindow unless ListPopupWindow.setOverlapAnchor
has been called explicitly.
Bug:
36714649
Test: ApiDemos > Views > Spinner
Change-Id: I5e66d4409a1f04cdc0fbe64e255609836c2b0e95
TreeHugger Robot [Wed, 5 Apr 2017 22:13:05 +0000 (22:13 +0000)]
Merge "Collect background stats: scheduled jobs" into oc-dev
Calin Juravle [Wed, 5 Apr 2017 22:07:48 +0000 (22:07 +0000)]
Merge "Fix dex flags for secondary dex files" into oc-dev
Jack Yu [Wed, 5 Apr 2017 21:12:09 +0000 (14:12 -0700)]
Fixed the obsolete logging
Added missing logging messages and removed legacy codes.
Test: adb bugreport
bug:
33041058
Change-Id: I38ec1aeb14ba4bf5b0e7df2aea45dcbd1bb3ff7f
Bryce Lee [Wed, 5 Apr 2017 21:55:12 +0000 (21:55 +0000)]
Merge "Remove accidental debugger wait." into oc-dev
Felipe Leme [Wed, 5 Apr 2017 21:46:50 +0000 (14:46 -0700)]
Dump autofill service component from settings.
Bug:
36978445
Test: manual verification
Change-Id: I30992452c94a78c05a5a98e94d5ffc5325151a76
Bryce Lee [Wed, 5 Apr 2017 21:49:44 +0000 (14:49 -0700)]
Remove accidental debugger wait.
Test: bit FrameworksServicesTests:com.android.server.am.ActivityStackSupervisorTests
Change-Id: I129b139a14d925221f2c9b614f45aedac1f153b5
TreeHugger Robot [Wed, 5 Apr 2017 21:48:06 +0000 (21:48 +0000)]
Merge "Restore @VisibleForTesting on NetworkScorerAppManager." into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 21:41:24 +0000 (21:41 +0000)]
Merge "Consolidate a11y unit tests and get them working" into oc-dev
Roozbeh Pournader [Wed, 5 Apr 2017 21:39:10 +0000 (21:39 +0000)]
Merge "Revert "Use KB instead of kB."" into oc-dev
Todd Kennedy [Wed, 5 Apr 2017 21:36:37 +0000 (21:36 +0000)]
Merge "don't log non-instant app resolutions" into oc-dev
Jorim Jaggi [Wed, 5 Apr 2017 21:29:55 +0000 (21:29 +0000)]
Merge "Check for null when updating header" into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 21:27:36 +0000 (21:27 +0000)]
Merge "Create Espresso test for WifiSettings." into oc-dev
Todd Kennedy [Wed, 5 Apr 2017 21:15:00 +0000 (14:15 -0700)]
don't honour domain verification for browsers
When a default browser is set, we change its domain verification status
to "INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS". This change is
global and permanent; it affects all URLs and won't be cleared by
resetting the browser's domain handling in settings.
To properly handle this, we don't pay attention to the domain verification
status for "browser" applications when we determine whether or not to
offer an instant app.
Change-Id: I1e2766e9856b0c9d3276e33a8db10195c72ae6ea
Fixes:
36978307
Test: Install firefox, start a browser intent [from command line], select chrome and choose "use always", start another browser intent that resolves to an instant app, see that ephemeral apps still resolve
Roozbeh Pournader [Wed, 5 Apr 2017 21:13:22 +0000 (21:13 +0000)]
Revert "Use KB instead of kB."
This reverts commit
8ebf40498f00cdb789b92b9394e69844f5df4e3a.
Bug:
27672362
Bug:
36496960
Change-Id: Id04623a400c30f3c9b218806c118c5e4ffada020
Roozbeh Pournader [Thu, 16 Feb 2017 02:19:09 +0000 (18:19 -0800)]
Use text input for various internationalized listeners
Since the characters that need to be entered for an internationalized
input type may not be available on the old non-internationalized
layouts, switch to the full text layout if there are any such
characters.
TextView is also modified to call the locale-aware listeners if
the target SDK is set to O or later.
Test: Manual
Bug: https://code.google.com/p/android/issues/detail?id=2626
Bug: https://code.google.com/p/android/issues/detail?id=82993
Bug:
8319249
Bug:
33276673
Bug:
34394455
Change-Id: I544bf0cc893a475ab5bf88cbad01cb981c6fef91
Ray Essick [Wed, 5 Apr 2017 21:01:00 +0000 (14:01 -0700)]
Move MediaMetrics into its own library
Changes for the new HAL structure have brought about a build time
circular dependency between libmedia and libmediadrm. This set of
changes the media metrics code into its own library and arranges
for the relevant consumers of the media metrics code to link
to this new library (where they had previously picked it up by
including libmedia).
Bug:
36990807
Test: build, boot.
George Mount [Wed, 5 Apr 2017 20:56:37 +0000 (13:56 -0700)]
Change getFragments() to return a List.
Bug
36762718
Bug
36982279
Changes getFragments() to return a List instead of a Collection.
The order is the order in which the fragment is added or attached.
Test: ran fragment cts tests
Change-Id: I10bbeef13e9154bbe052127cfa0e160b2e500b4d
Winson Chung [Wed, 5 Apr 2017 18:49:38 +0000 (11:49 -0700)]
Workaround for input ANR, always finish PiP menu activity.
- Always finish the PiP menu activity when the interaction is complete
(either the menu is hidden after showing, or when the user stops
interacting with it and it was shown for the dismiss overlay)
- Fix issue with bounds animation callback not working due to the app
window being removed and not updating the app transition that its
animation "finished"
- Add additional logging throughout to trace PiP animation
Bug:
36877782
Test: Enter PIP, tap to show menu, wait for it to hide, and then use
wired headset button
Change-Id: Ie88ba107d7fffdd182a4063ef4f324b58669d0ad
Tenghui Zhu [Wed, 5 Apr 2017 20:44:28 +0000 (20:44 +0000)]
Merge "Make sure we handle the matrix separately for non-invertable matrix" into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 20:43:38 +0000 (20:43 +0000)]
Merge "Allow background default container service in a less crashy way" into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 20:43:19 +0000 (20:43 +0000)]
Merge "AAPT2: Fix pseudolocalization (again)" into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 20:41:56 +0000 (20:41 +0000)]
Merge "Fix NPE when adding WebView to ResourcesManager" into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 20:40:53 +0000 (20:40 +0000)]
Merge "Work on issue #
36869295: com.qti.qualcomm.datastatusnotification..." into oc-dev
Dianne Hackborn [Wed, 5 Apr 2017 00:23:14 +0000 (17:23 -0700)]
Work on issue #
36869295: com.qti.qualcomm.datastatusnotification...
...is not Bg Check compliant
Make the exception message include the state of the app's
UidRecord to help debug what is going on.
Test: boot and ran
Change-Id: Ie829265c7979ccabf8bae0bc6521bd9a7357d77f
Dianne Hackborn [Wed, 5 Apr 2017 20:37:31 +0000 (20:37 +0000)]
Merge "Deliver start service args with ParcelledListSlice." into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 20:30:15 +0000 (20:30 +0000)]
Merge changes Ibdf9cf90,I3a6dd476,Id4008fc7,Iede88d1e into oc-dev
* changes:
NotificationViewWrapper: Fix crash for custom views
Revert "Revert "AOD: Use color filter to invert icons for AOD""
Revert "Revert "NotificationWrappers: Factor out doze treatment""
AOD: prevent clicking shelf when dark
TreeHugger Robot [Wed, 5 Apr 2017 20:25:36 +0000 (20:25 +0000)]
Merge "Removed deprecated auto(F)ill classes." into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 20:18:38 +0000 (20:18 +0000)]
Merge "Clear calling identity before getUserAccounts in AccountManagerService" into oc-dev
Chad Brubaker [Wed, 5 Apr 2017 20:08:21 +0000 (13:08 -0700)]
Serialize visibleToInstantApps
Bug:
36972663
Test: Webview continues working
Change-Id: I680797f0a7edc71917aaf2e0bc56972a39847f8f
TreeHugger Robot [Wed, 5 Apr 2017 20:01:59 +0000 (20:01 +0000)]
Merge "Tweak javadoc of setResetPasswordToken" into oc-dev
Daniel Nishi [Wed, 5 Apr 2017 19:59:12 +0000 (19:59 +0000)]
Merge "Add storage fullness methods to volume provider." into oc-dev
Emilian Peev [Thu, 23 Mar 2017 19:20:40 +0000 (19:20 +0000)]
Camera: Initial support for vendor tag caches
Vendor tag cache will be used alternatively to the regular
Vendor tag descriptor. The caches can support multiple vendor
tag providers at the same time. The native metadata along with
the requests/results/characteristics will store vendor specific
information that will be used to indentify the respective
descriptor.
Bug:
34275821
Test: Complete Camera/Camera2 CTS tests
Change-Id: I50b7cf9aa5575944fde7673a1728869690b2ce0d
Kang Li [Wed, 5 Apr 2017 19:50:06 +0000 (19:50 +0000)]
Merge "Revert "Add a service to rank apps for ResolverActivity."" into oc-dev
Kang Li [Wed, 5 Apr 2017 16:13:12 +0000 (16:13 +0000)]
Revert "Add a service to rank apps for ResolverActivity."
This reverts commit
90370e0b2497deba9382ab7ff1539b6849df8139.
b:
36952725
Change-Id: Ifa8f182c707cdbbc989b1f61630f7a8fa856d32d
Todd Kennedy [Wed, 5 Apr 2017 19:32:23 +0000 (19:32 +0000)]
Merge "look for old intent values" into oc-dev
George Mount [Wed, 5 Apr 2017 19:30:17 +0000 (12:30 -0700)]
Save FragmentManagerNonConfig during onSaveInstanceState()
Bug
36815706
onSaveInstanceState() is called prior to onStop(), but
onRetainNonConfigInstance() is called after. When a
retained instance fragment is added during onStop(),
the state of the two configurations won't match. This
CL moves the non-configuration save to happen immediately
after the save instance state.
Support Lib Change: Ib41cbe02d060d3411e32d1494525e119d0c23dd7
Test: I30e598abf7faceac3294aef1ee0ee3b07d3aa7c6
Change-Id: I861629e2c6da2d8b0e075e8283b631fdf80670c0
Tony Mak [Mon, 3 Apr 2017 17:38:23 +0000 (18:38 +0100)]
Do not stop lock task if it is starting background user
We do not switch user when starting background user, so no need to
stop lock task.
Refactor a bit to make unit test possible.
Test: runtest -x frameworks/base/services/tests/servicestests/src/com/android/server/am/UserControllerTest.java
Test: Lock an app using TestDPC, creating work profile, lock task is not dismissed
Bug:
35591838
Change-Id: I52c1f6ba07860df9266462750bf953a002f69026
TreeHugger Robot [Wed, 5 Apr 2017 18:29:17 +0000 (18:29 +0000)]
Merge "Add api to retrieve call creation time." into oc-dev
Adrian Roos [Wed, 5 Apr 2017 00:22:03 +0000 (17:22 -0700)]
NotificationViewWrapper: Fix crash for custom views
Bug:
36430936
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationViewWrapperTest.java
Change-Id: Ibdf9cf90fcb69a8af8a3b60596143e3be83fe46e
Merged-In: Ibdf9cf90fcb69a8af8a3b60596143e3be83fe46e
Dmitry Dementyev [Tue, 4 Apr 2017 18:12:42 +0000 (11:12 -0700)]
Clear calling identity before getUserAccounts in
AccountManagerService
Fix accountsDb tests.
Bug:
36860606
Test: manual
Change-Id: Iad86d1bf7edd0f847262562ace9c2d5c9fdff978
(cherry picked from commit
9fc6f574b43c938913fad7a2ed04b5a7c717bd68)
Adrian Roos [Tue, 4 Apr 2017 23:44:29 +0000 (16:44 -0700)]
Revert "Revert "AOD: Use color filter to invert icons for AOD""
This reverts commit
30d9bad7673eaa518cc43444259f71af9b34e5ec.
Change-Id: I3a6dd476cb90074d012a05bb291eeaf441fe20d3
Merged-In: I3a6dd476cb90074d012a05bb291eeaf441fe20d3
Adrian Roos [Tue, 4 Apr 2017 23:44:25 +0000 (16:44 -0700)]
Revert "Revert "NotificationWrappers: Factor out doze treatment""
This reverts commit
934027a4307d5bc4896d662fd92c47c556e11cca.
Change-Id: Id4008fc79e474f3820f3587dff40720a57c9ef3a
Merged-In: Id4008fc79e474f3820f3587dff40720a57c9ef3a
Adrian Roos [Wed, 29 Mar 2017 00:54:05 +0000 (17:54 -0700)]
AOD: prevent clicking shelf when dark
Fixes:
35718464
Test: Enable AOD, try clicking on shelf in AOD, make sure it's not clickable.
Change-Id: Iede88d1e0ab394f0db2acaac6a1ad8baaeef15f1
Nathan Harold [Wed, 5 Apr 2017 17:15:04 +0000 (10:15 -0700)]
Fix Log Traces for IpSecService
Bug:
36920223
Test: boot and see full log
Change-Id: I1ac53f172094082c53b53a950058c862d257b7e5
(cherry picked from commit
d3e3f1593a523d488c76be2494d94a399e52dc9d)
Wei Wang [Wed, 5 Apr 2017 05:00:01 +0000 (22:00 -0700)]
SystemServer: fix StartIpSecService trace and log
Bug:
36920223
Test: boot and see log
Change-Id: I9b88564ac7eef6998af465b977fa66c7d0787cf2
(cherry picked from commit
90f4c0907e8f746f0f840e76057f84ec20adf46d)
Rubin Xu [Wed, 5 Apr 2017 17:37:07 +0000 (18:37 +0100)]
Tweak javadoc of setResetPasswordToken
Bug:
34600579
Test: make -j32 docs
Change-Id: Ib4593c20fb78f52d5e75cafdfea32d747cc340c9
ztenghui [Wed, 5 Apr 2017 00:33:40 +0000 (17:33 -0700)]
Make sure we handle the matrix separately for non-invertable matrix
b/
36895991
Test: added CTS tests and Run spotify
Change-Id: I2786e612494530405dad5c3edb2bc53915a1c2dc
Adam Lesinski [Wed, 5 Apr 2017 18:04:17 +0000 (11:04 -0700)]
Fix NPE when adding WebView to ResourcesManager
Framework resources have their mResDir set to null, since the framework
resources are implicitly always included. Guard against null
when checking to see if the Resources mResDir matches the asset path
WebView wants to inject itself into.
Bug:
36953234
Test: manual
Change-Id: Ie3dc0cc1240441a2466585224cdc7c15555c66bf
Bryce Lee [Wed, 5 Apr 2017 18:01:52 +0000 (18:01 +0000)]
Merge "Do not try to restore a task id if it does not exist." into oc-dev
Bryce Lee [Wed, 5 Apr 2017 18:00:28 +0000 (18:00 +0000)]
Merge "Fix ActivityRecordTests." into oc-dev
Adrian Roos [Wed, 5 Apr 2017 17:47:29 +0000 (17:47 +0000)]
Merge changes I70f79400,I2f8cab37 into oc-dev
* changes:
AOD: Adjust header to spec
AOD: Only show actually pulsing entries
TreeHugger Robot [Wed, 5 Apr 2017 17:46:18 +0000 (17:46 +0000)]
Merge "support notification channel for defaultcarrier app" into oc-dev
Tony Wickham [Wed, 5 Apr 2017 17:37:11 +0000 (17:37 +0000)]
Merge "Add AppWidgetManager#getInstalledProvidersForPackage()" into oc-dev
Nathan Harold [Tue, 7 Mar 2017 21:23:36 +0000 (13:23 -0800)]
Add Initial IPsec APIs to IpSecService
-Plumb IpSecManager APIs to NetD
-Add Resource Management to IpSecService
Bug:
30984788
Test: b/
34812052, b/
34811227
Change-Id: Ic43965c6158f28cac53810adbf5cf50d2c54f920
(cherry picked from commit
93962f34ce21f5aac825afbcebf2f3e8c7a30910)
Nathan Harold [Thu, 30 Mar 2017 18:01:37 +0000 (11:01 -0700)]
IpSecManager and IpSecTransform API Cleanup
-Remove Int-based SPI usage from the IpSecTransform.Builder
This is essentially a less-safe method overload, and it is both
unnecessary and difficult to implement: the cross-validation
between SPI and Transform is actually useful, and the kernel
requires two different mechanisms to use an unreserved vs a
reserved (alloc'd) SPI: CREATESA vs UPDATESA, which makes this
hard to support. API Council has questioned the value of this,
and they are right: everything points to "remove this". In the
future, if we find that SPI reservation is overhead, we can
always add it back.
-Hiding the TunnelMode builder method and application/remove
methods. These will not land by the time the next API
stabilizes, so better to hide them now that this is a
near-certainty. Expectation is to un-hide them in the subsequent
API bump.
Bug:
36073210
Test: Compilation, verified nobody is calling these stubs
Change-Id: Ic1a3f2cf7128633318ac175d6b56b45eb8d21cab
(cherry picked from commit
48b566557d5a66d4476008b3c59b815eb78cb373)
Nathan Harold [Wed, 29 Mar 2017 17:47:59 +0000 (10:47 -0700)]
Change reserveSecurityParameterIndex() to take a remoteAddress
To make the SPI reservation more semantically consistent with the
transform creation API, and to ensure that we always create SPI
reservations relative to a well-known remote, we should take the
SPI request relative to a remote (rather than to a destination).
This necessitates that we now consider direction separately, which
is used for keying the SA-Id.
Bug:
36073210
Test: compilation
Change-Id: I81e955c20128c1f8e04fd68eb26669561f827a78
(cherry picked from commit
c4f879925b58b1b5ca9a3cfdc898c20cbf56355a)
Nathan Harold [Thu, 2 Mar 2017 02:55:06 +0000 (18:55 -0800)]
Add a Skeleton IpSecService
-Add IpSecService with the necessary glue to connect to netd
-Add code to retrieve IpSecService from System Server
Bug:
30984788
Test: b/
34812052, b/
34811227
Change-Id: I4cdcb643421141202f77a0e2f87a37012de0cd92
(cherry picked from commit
28084d89ec136b56f5012be33a0dea147962f9f6)