OSDN Git Service

android-x86/frameworks-base.git
7 years agoWebView: remove @Nullable from SB whitelist
Nate Fischer [Tue, 18 Jul 2017 23:08:42 +0000 (16:08 -0700)]
WebView: remove @Nullable from SB whitelist

This removes the @Nullable annotation from
WebView#setSafeBrowsingWhitelist's List parameter. This does not need to
be Nullable, since the whitelist can be unset just as easily by passing
an empty list.

Bug: 63084528
Test: N/A
Change-Id: Ica9d67bc907b16e89d0a1b6a15d91e21f74cc4c9

7 years agoMerge "Don't recycle bitmaps we don't own" into oc-dr1-dev am: bc907cf9a8
Lucas Dupin [Tue, 18 Jul 2017 20:34:49 +0000 (20:34 +0000)]
Merge "Don't recycle bitmaps we don't own" into oc-dr1-dev am: bc907cf9a8
am: 11e0e33756

Change-Id: Ifcb92445f6e8cda2a2c9eb4350be65937ea5787b

7 years agoMerge "Don't recycle bitmaps we don't own" into oc-dr1-dev
Lucas Dupin [Tue, 18 Jul 2017 20:24:53 +0000 (20:24 +0000)]
Merge "Don't recycle bitmaps we don't own" into oc-dr1-dev
am: bc907cf9a8

Change-Id: Ib5533fdbcfba36fc1ed82e0089cc681e73a02f05

7 years agoMerge "Add a system property support to disable background dexopt job"
TreeHugger Robot [Tue, 18 Jul 2017 20:11:59 +0000 (20:11 +0000)]
Merge "Add a system property support to disable background dexopt job"

7 years agoMerge "Don't reset review state until no permission requires a review."
Svetoslav Ganov [Tue, 18 Jul 2017 20:11:19 +0000 (20:11 +0000)]
Merge "Don't reset review state until no permission requires a review."

7 years agoMerge "Don't recycle bitmaps we don't own" into oc-dr1-dev
TreeHugger Robot [Tue, 18 Jul 2017 20:08:58 +0000 (20:08 +0000)]
Merge "Don't recycle bitmaps we don't own" into oc-dr1-dev

7 years agoMerge "Add home activity methods to wrapper." into oc-dr1-dev am: d332076636
Daniel Nishi [Tue, 18 Jul 2017 20:02:34 +0000 (20:02 +0000)]
Merge "Add home activity methods to wrapper." into oc-dr1-dev am: d332076636
am: 5ec6335b74

Change-Id: Iee4b88878f5784172e363c9670f234bda092c6fd

7 years agoMerge "Fix rotation animation selection." into oc-dr1-dev am: cee8098178
Rob Carr [Tue, 18 Jul 2017 20:01:05 +0000 (20:01 +0000)]
Merge "Fix rotation animation selection." into oc-dr1-dev am: cee8098178
am: 228571391e

Change-Id: Idd2a3c23233f0758cc96a55da97b99c6ee8a7c94

7 years agoMerge "Do not register for broadcasts within NoMan test." into oc-dr1-dev am: f80ec1583d
Geoffrey Pitsch [Tue, 18 Jul 2017 19:59:31 +0000 (19:59 +0000)]
Merge "Do not register for broadcasts within NoMan test." into oc-dr1-dev am: f80ec1583d
am: 0a0f7cea05  -s ours

Change-Id: Ie0978bbc4c2804563f7b62eb943a617ab634f95a

7 years agoMerge "[AsyncChannel] Fix race in handling of sync result"
TreeHugger Robot [Tue, 18 Jul 2017 19:51:58 +0000 (19:51 +0000)]
Merge "[AsyncChannel] Fix race in handling of sync result"

7 years agoMerge "Add home activity methods to wrapper." into oc-dr1-dev
Daniel Nishi [Tue, 18 Jul 2017 19:44:33 +0000 (19:44 +0000)]
Merge "Add home activity methods to wrapper." into oc-dr1-dev
am: d332076636

Change-Id: I623d431fe052649ee2bf80a6ab459f6424f7e9e0

7 years agoMerge "Internationalize ZoneGetter properly"
TreeHugger Robot [Tue, 18 Jul 2017 19:42:07 +0000 (19:42 +0000)]
Merge "Internationalize ZoneGetter properly"

7 years agoMerge "Fix rotation animation selection." into oc-dr1-dev
Rob Carr [Tue, 18 Jul 2017 19:39:46 +0000 (19:39 +0000)]
Merge "Fix rotation animation selection." into oc-dr1-dev
am: cee8098178

Change-Id: I1f742419b6f25d74a8b2d895155796f0e718da59

7 years agoMerge "Do not register for broadcasts within NoMan test." into oc-dr1-dev
Geoffrey Pitsch [Tue, 18 Jul 2017 19:38:18 +0000 (19:38 +0000)]
Merge "Do not register for broadcasts within NoMan test." into oc-dr1-dev
am: f80ec1583d

Change-Id: Id03863d7f6bb6a10ac82c504c3c64227e7286cd6

7 years agoMerge "Add home activity methods to wrapper." into oc-dr1-dev
Daniel Nishi [Tue, 18 Jul 2017 19:34:42 +0000 (19:34 +0000)]
Merge "Add home activity methods to wrapper." into oc-dr1-dev

7 years agoMerge "Fix rotation animation selection." into oc-dr1-dev
Rob Carr [Tue, 18 Jul 2017 19:31:00 +0000 (19:31 +0000)]
Merge "Fix rotation animation selection." into oc-dr1-dev

7 years agoMerge "Do not register for broadcasts within NoMan test." into oc-dr1-dev
Geoffrey Pitsch [Tue, 18 Jul 2017 19:30:28 +0000 (19:30 +0000)]
Merge "Do not register for broadcasts within NoMan test." into oc-dr1-dev

7 years agoMerge "Opt-out for always-on VPN"
Charles He [Tue, 18 Jul 2017 18:47:45 +0000 (18:47 +0000)]
Merge "Opt-out for always-on VPN"

7 years agoMerge "Renamed attribute with abbreviated name" into oc-dr1-dev am: df83b8cfcf
Lucas Dupin [Tue, 18 Jul 2017 18:45:46 +0000 (18:45 +0000)]
Merge "Renamed attribute with abbreviated name" into oc-dr1-dev am: df83b8cfcf
am: 6ee8fc2347

Change-Id: Ic77e64ebb731ba3f6416adade2ecd96ca27ae058

7 years agoMerge "Renamed attribute with abbreviated name" into oc-dr1-dev
Lucas Dupin [Tue, 18 Jul 2017 18:36:12 +0000 (18:36 +0000)]
Merge "Renamed attribute with abbreviated name" into oc-dr1-dev
am: df83b8cfcf

Change-Id: Id2b3ebf54192171f81028da83469a9efdc2840ea

7 years agoMerge "Renamed attribute with abbreviated name" into oc-dr1-dev
TreeHugger Robot [Tue, 18 Jul 2017 18:23:55 +0000 (18:23 +0000)]
Merge "Renamed attribute with abbreviated name" into oc-dr1-dev

7 years agoMerge changes from topic 'android-lowpan-next'
Robert Quattlebaum [Tue, 18 Jul 2017 17:30:41 +0000 (17:30 +0000)]
Merge changes from topic 'android-lowpan-next'

* changes:
  lowpan: AIDL refactor to no longer use property design pattern
  LowpanException: Refactor exception handling
  lowpan: Introduce new unit tests for data classes
  lowpan: Make various data classes Parcelable
  lowpan: Remove libandroid_net_lowpan from platform/frameworks/base
  LowpanEnergyScanResult: Remove `public` designation from setChannel/setMaxRssi

7 years agoMerge "Add log when we are trying to dismiss keyguard"
TreeHugger Robot [Tue, 18 Jul 2017 17:27:48 +0000 (17:27 +0000)]
Merge "Add log when we are trying to dismiss keyguard"

7 years agoMerge "Don't move stack to bottom when creating task at bottom"
TreeHugger Robot [Tue, 18 Jul 2017 17:21:49 +0000 (17:21 +0000)]
Merge "Don't move stack to bottom when creating task at bottom"

7 years agoMerge "Ensure home activity always is on home stack." into oc-dr1-dev am: 560acb043d
Bryce Lee [Tue, 18 Jul 2017 17:15:23 +0000 (17:15 +0000)]
Merge "Ensure home activity always is on home stack." into oc-dr1-dev am: 560acb043d
am: 0d2c7dace3

Change-Id: I1399f6c7425d8f7e3ef6c69a25b67b96597574b1

7 years agoAdd a system property support to disable background dexopt job
Shubham Ajmera [Fri, 14 Jul 2017 01:46:02 +0000 (18:46 -0700)]
Add a system property support to disable background dexopt job

Bug: 34812714
Test: Verified the property value on the device
Change-Id: Ibfa46f90a8df772eb684c0e5bd421e46a5798a85

7 years agoMerge "Reduce app size by downgrading inactive apps"
Shubham Ajmera [Tue, 18 Jul 2017 17:09:06 +0000 (17:09 +0000)]
Merge "Reduce app size by downgrading inactive apps"

7 years agoMerge "Ensure home activity always is on home stack." into oc-dr1-dev
Bryce Lee [Tue, 18 Jul 2017 17:06:09 +0000 (17:06 +0000)]
Merge "Ensure home activity always is on home stack." into oc-dr1-dev
am: 560acb043d

Change-Id: I41ec14fb2ff092643c2ce54e263da91769541b49

7 years agoMerge "Make it possible to check if a given program/identifier type is supported."
Tomasz Wasilczyk [Tue, 18 Jul 2017 17:00:54 +0000 (17:00 +0000)]
Merge "Make it possible to check if a given program/identifier type is supported."

7 years agoMerge "Verify SBackGroundColor before using it"
TreeHugger Robot [Tue, 18 Jul 2017 17:00:04 +0000 (17:00 +0000)]
Merge "Verify SBackGroundColor before using it"

7 years agoMerge "Ensure home activity always is on home stack." into oc-dr1-dev
Bryce Lee [Tue, 18 Jul 2017 16:59:10 +0000 (16:59 +0000)]
Merge "Ensure home activity always is on home stack." into oc-dr1-dev

7 years agoMerge "Don't preload drawables with bitmaps"
TreeHugger Robot [Tue, 18 Jul 2017 16:58:36 +0000 (16:58 +0000)]
Merge "Don't preload drawables with bitmaps"

7 years agoMerge "Fill announcement-related gaps in Broadcast Radio APIs."
Tomasz Wasilczyk [Tue, 18 Jul 2017 16:49:17 +0000 (16:49 +0000)]
Merge "Fill announcement-related gaps in Broadcast Radio APIs."

7 years agoDo not register for broadcasts within NoMan test.
Geoffrey Pitsch [Tue, 18 Jul 2017 14:35:22 +0000 (10:35 -0400)]
Do not register for broadcasts within NoMan test.

Fixes potential flake when broadcasts come in after Looper has
terminated.

Change-Id: Id63d27970b1ffacccfa8f1b074f744b6547ffcf9
Fixes: 63797731
Test: runtest systemui-notification

7 years agoMerge "Unify permissions under UPDATE_DEVICE_STATS."
Jeff Sharkey [Tue, 18 Jul 2017 16:17:02 +0000 (16:17 +0000)]
Merge "Unify permissions under UPDATE_DEVICE_STATS."

7 years agoMerge "Deprecate onMetadataChanged."
Tomasz Wasilczyk [Tue, 18 Jul 2017 16:15:17 +0000 (16:15 +0000)]
Merge "Deprecate onMetadataChanged."

7 years agoMerge "Implement ProgramSelector for font-end Java APIs."
Tomasz Wasilczyk [Tue, 18 Jul 2017 15:36:22 +0000 (15:36 +0000)]
Merge "Implement ProgramSelector for font-end Java APIs."

7 years agoAdd log when we are trying to dismiss keyguard
Jorim Jaggi [Tue, 18 Jul 2017 12:05:19 +0000 (14:05 +0200)]
Add log when we are trying to dismiss keyguard

Such that we can blame the app!

Test: call requestDismissKeyguard, inspect logs
Bug: 63745706
Change-Id: Ie257db2276839ba3491ee1b3cb642486331544c1

7 years agoVerify SBackGroundColor before using it
Leon Scroggins III [Wed, 12 Jul 2017 17:28:46 +0000 (13:28 -0400)]
Verify SBackGroundColor before using it

Test: Ib76234d8a05732936ffd4218e350a8a4415702cf

Bug: 37662286
Change-Id: If6ebddbdb6cb34c9318936358cdc9c657717915a

7 years agoMerge "NetworkPolicyManagerService: Allow data saver to be on by default."
TreeHugger Robot [Tue, 18 Jul 2017 13:55:51 +0000 (13:55 +0000)]
Merge "NetworkPolicyManagerService: Allow data saver to be on by default."

7 years agoDon't move stack to bottom when creating task at bottom
Wale Ogunwale [Tue, 18 Jul 2017 13:33:01 +0000 (06:33 -0700)]
Don't move stack to bottom when creating task at bottom

When creating a task, only move the parents of the task if we are creating
the task at the top of the stack. i.e. creating the task at the top of its
stack will move the stack forward and creating the task at the bottom of
the stack shouldn't move the stack backwards. Creating a task at the bottom
is used for things like restoring a task from recents to use for other things
and for background user, so shouldn't affect visibility of its parent stack.

Change-Id: Ifcaf7c5a95294631dff675ac5c7d87f059b1792a
Fixes: 62352722
Test: go/wm-smoke

7 years agoMerge "Separate android.test.mock classes from android.test.runner"
Paul Duffin [Tue, 18 Jul 2017 13:11:18 +0000 (13:11 +0000)]
Merge "Separate android.test.mock classes from android.test.runner"

7 years agoUpdate JNI code in preparation for ICU 59 switching to C++11 char16_t. am: 253e515259...
Fredrik Roubert [Tue, 18 Jul 2017 11:21:28 +0000 (11:21 +0000)]
Update JNI code in preparation for ICU 59 switching to C++11 char16_t. am: 253e515259 am: 042534c352
am: 3d7c99a174  -s ours

Change-Id: Ib7d9441d1e97818fb7a852b0dcc297d915453327

7 years agoUpdate JNI code in preparation for ICU 59 switching to C++11 char16_t. am: 253e515259
Fredrik Roubert [Tue, 18 Jul 2017 11:14:55 +0000 (11:14 +0000)]
Update JNI code in preparation for ICU 59 switching to C++11 char16_t. am: 253e515259
am: 042534c352

Change-Id: I34b8a04b7589dc8cc5850aba5c3d50aa2c1b4e02

7 years agoUpdate JNI code in preparation for ICU 59 switching to C++11 char16_t.
Fredrik Roubert [Tue, 18 Jul 2017 11:08:47 +0000 (11:08 +0000)]
Update JNI code in preparation for ICU 59 switching to C++11 char16_t.
am: 253e515259

Change-Id: I064ae78ad17bef67d6e90c7ce0aed4e9693c9ac6

7 years agoMerge "Delay marquee scrolling on lockscreen by 2 seconds." into oc-dr1-dev am: 331a2...
Geoffrey Pitsch [Tue, 18 Jul 2017 10:35:17 +0000 (10:35 +0000)]
Merge "Delay marquee scrolling on lockscreen by 2 seconds." into oc-dr1-dev am: 331a287656
am: 3c778dc07a

Change-Id: I59b79e4591868ebd02a5a6f231b092290a878781

7 years agoMerge "Delay marquee scrolling on lockscreen by 2 seconds." into oc-dr1-dev
Geoffrey Pitsch [Tue, 18 Jul 2017 10:29:23 +0000 (10:29 +0000)]
Merge "Delay marquee scrolling on lockscreen by 2 seconds." into oc-dr1-dev
am: 331a287656

Change-Id: Ie00665beb58cfb797cfdc85c20adfb28988055b2

7 years agoMerge "Delay marquee scrolling on lockscreen by 2 seconds." into oc-dr1-dev
TreeHugger Robot [Tue, 18 Jul 2017 10:24:17 +0000 (10:24 +0000)]
Merge "Delay marquee scrolling on lockscreen by 2 seconds." into oc-dr1-dev

7 years agoUpdate JNI code in preparation for ICU 59 switching to C++11 char16_t.
Fredrik Roubert [Thu, 6 Apr 2017 20:13:51 +0000 (22:13 +0200)]
Update JNI code in preparation for ICU 59 switching to C++11 char16_t.

ICU 59 (update pending on the aosp/icu59 branch) has switched to using
the C++11 char16_t data type, which is a distinct type from uint16_t
(which is what JNI's jchar is typedef'd as), even though they are
bitwise identical.

All code that passes UTF-16 data between ICU4C and JNI must therefore be
updated with typecasts in the appropriate places before ICU 59 is merged
to aosp/master.

Bug: 37554848
Test: make
Change-Id: Ibbc90d2b603382d4715551d05c4a6a462529542d
Merged-In: Ic84a94be82acbef41f80cc113d5da485ce54ae29

7 years agoNetworkPolicyManagerService: Allow data saver to be on by default.
Narayan Kamath [Mon, 17 Jul 2017 14:32:53 +0000 (15:32 +0100)]
NetworkPolicyManagerService: Allow data saver to be on by default.

This value is read from the global settings provider, and can be
configured via an overlay.

Bug: 63112872
Test: NetworkPolicyManagerServiceTest

Change-Id: If55ea08df1dd8440189f9b46a5606118de99c930

7 years agoMerge "IP connectivity metrics: fix tests after proto update"
TreeHugger Robot [Tue, 18 Jul 2017 07:58:33 +0000 (07:58 +0000)]
Merge "IP connectivity metrics: fix tests after proto update"

7 years agolowpan: AIDL refactor to no longer use property design pattern
Robert Quattlebaum [Fri, 14 Jul 2017 19:18:39 +0000 (12:18 -0700)]
lowpan: AIDL refactor to no longer use property design pattern

After doing a considerable amount of thinking on the subject,
I decided that attempting to directly port wpantund's property-based
API over to Binder was a mistake, so this commit contains the required
changes to abandon that approach and go with a more traditional
Binder interface.

Bug: b/63708348
Change-Id: I685cd066fabe8470ef4bb456aea7d3bb515c3969
Test: Compiled and ran unit tests, manually confirmed lowpanctl
      and lowpan-service (with related changes) appeared to be
      working properly.

7 years agoLowpanException: Refactor exception handling
Robert Quattlebaum [Fri, 14 Jul 2017 19:09:59 +0000 (12:09 -0700)]
LowpanException: Refactor exception handling

Got rid of the exposed exception code and we now rely on subclasses of
LowpanException. Also introduces a new exception: LowpanRuntimeException

LowpanRuntimeException, as a subclass of AndroidRuntimeException,
doesn't need explicitly delared "throws" statements for function
declarations. Most Exceptions are still LowpanExceptions, but some
specific error codes, such as ERROR_NCP_PROBLEM, are now using this
new exception class.

Bug: b/63708181
Change-Id: Idba6233ac4803d33561b5aa951c8fa846c3ab1d8

7 years agolowpan: Introduce new unit tests for data classes
Robert Quattlebaum [Fri, 14 Jul 2017 19:05:29 +0000 (12:05 -0700)]
lowpan: Introduce new unit tests for data classes

This change introduces new unit tests which confirm that
various data classes are being property marshalled
between their Java and C++ implementations.

Bug: b/63707448 b/63708348
Change-Id: I41d590b1e77dc41873c4b9e9bf1b7f1bf859f74e
Test: These tests both compile and pass

7 years agoIP connectivity metrics: fix tests after proto update
Hugo Benichi [Tue, 18 Jul 2017 05:28:27 +0000 (14:28 +0900)]
IP connectivity metrics: fix tests after proto update

Update to ipconnectivity.proto in commit
6d2f506bfd788a3685292d404dc9d82a27357cfe broke the associated unit
tests (Change-Id: I4cf5b95956df721aecd63fddfb026a7266c190b9)

Bug: 34901696
Test: runtest frameworks-net
Change-Id: I57a6bad8a9836b1c45690c4589b416786ce1dfa0

7 years agoMerge "Reference nativehelper/jni.h as jni.h"
TreeHugger Robot [Tue, 18 Jul 2017 03:55:03 +0000 (03:55 +0000)]
Merge "Reference nativehelper/jni.h as jni.h"

7 years agolowpan: Make various data classes Parcelable
Robert Quattlebaum [Fri, 14 Jul 2017 19:02:19 +0000 (12:02 -0700)]
lowpan: Make various data classes Parcelable

This change updates several of the data classes in
`android.net.lowpan` to be parcelable. This allows them to be used
directly for inter-process communication.

Bug: b/63707448 b/63708348
Change-Id: Ib5e8cad153534948ff4b43a2fda82f3db250839e
Test: Confirmed with unit tests from change id
      I41d590b1e77dc41873c4b9e9bf1b7f1bf859f74e

7 years agolowpan: Remove libandroid_net_lowpan from platform/frameworks/base
Robert Quattlebaum [Fri, 7 Jul 2017 20:56:32 +0000 (13:56 -0700)]
lowpan: Remove libandroid_net_lowpan from platform/frameworks/base

This change removes the Android.mk file that created the target
libandroid_net_lowpan from platform/frameworks/base.

This native library has moved to frameworks/opt/net/lowpan via the
following change id:

    I3dc7b9ca3b33b2ee5f92c8f76c28710997fb931d

Bug: b/63707448 b/63708348
Test: Confirmed with unit tests from change id
      I41d590b1e77dc41873c4b9e9bf1b7f1bf859f74e
Change-Id: Ifbfe75dbfbfc0ac2c02124dcac151a9caf6b342a

7 years agoReference nativehelper/jni.h as jni.h
Steven Moreland [Tue, 18 Jul 2017 02:00:43 +0000 (19:00 -0700)]
Reference nativehelper/jni.h as jni.h

nativehelper will no longer export nativehelper/jni.h so that everywhere
can reference this file with the same name.

Bug: 63762847
Change-Id: I3e58d478a2eb17b19db540414545a3c1f9c381af

7 years agoFix rotation animation selection.
Robert Carr [Tue, 18 Jul 2017 01:37:06 +0000 (18:37 -0700)]
Fix rotation animation selection.

The default manifest value needs to be unspecified, not rotate,
as rotate overrides the LayoutParams specified value.

Bug: 63151981
Test: Manual from bug. go/wm-smoke.
Change-Id: I2ad6e3fdd06eeef0166bbe09d07b57cc45ed6e50

7 years agoReduce app size by downgrading inactive apps
Shubham Ajmera [Thu, 25 May 2017 00:46:36 +0000 (17:46 -0700)]
Reduce app size by downgrading inactive apps

This will trigger when the device will have low space.
Active apps here refer to the apps which were either active
in foregrond or in background and also used by other packages.
Apps which are inactive for X days downgraded to verify. X is
determined by sysprop pm.dexopt.unopt_after_inactive_days

If the system properties are not set, no effect will take place.

The above operations will take place in background dexopt service.
If user uses the app again, it will again be speed-compiled when
background dexopt service starts next time.

Bug: 36598475
Test: manual
* Remove the check in the code that allows downgrade only when
  the space is low on the device.
* adb root
* Set pm.dexopt_unopt_after_inactive_days to 600
* Make sure the current time of the device is correctly set
* Install 2 non system apps - B, C
* Downgrade B to extract
* Upgrade a system apps to speed-profile - E
* Downgrade a system app to quicken - G
* adb shell cmd package bg-dexopt-job

Expected Results:
* Extract - B
* Verify - C
* There should not be any entries for apps E an G
  in dalvik_cache

Change-Id: I68f9f617d6722a7ba8b00aa2181cb38a165cfc51

7 years agoMerge "WebView: change setSafeBrowsingWhiteList signature"
TreeHugger Robot [Tue, 18 Jul 2017 00:54:41 +0000 (00:54 +0000)]
Merge "WebView: change setSafeBrowsingWhiteList signature"

7 years agoRenamed attribute with abbreviated name
Lucas Dupin [Tue, 18 Jul 2017 00:25:20 +0000 (17:25 -0700)]
Renamed attribute with abbreviated name

Renamed attribute as part of refactoring overlays.

Bug: 63751714
Test: make
Change-Id: Ia75fbf6c1dbcbd530d6b03a239b61b61719da8e0

7 years agoDon't preload drawables with bitmaps
Makoto Onuki [Mon, 17 Jul 2017 17:55:11 +0000 (10:55 -0700)]
Don't preload drawables with bitmaps

- On Marlin it'll save ~12MB from zygote
- On Gobo it'll save ~2MB

Bug 63136392
Test: Build and boot

Change-Id: I4a26c9e7a3c60d31eb31ea9ab9e14de64c4d7904

7 years agoMerge "Fix typo in sync log." into oc-dr1-dev am: 479b762f99
Makoto Onuki [Tue, 18 Jul 2017 00:19:11 +0000 (00:19 +0000)]
Merge "Fix typo in sync log." into oc-dr1-dev am: 479b762f99
am: 0d126ceddb

Change-Id: If505ad732d3353bc21e4265230205fdf0f4f267d

7 years agoMerge "Fix typo in sync log." into oc-dr1-dev
Makoto Onuki [Tue, 18 Jul 2017 00:14:22 +0000 (00:14 +0000)]
Merge "Fix typo in sync log." into oc-dr1-dev
am: 479b762f99

Change-Id: Id9d3f896a534714eaf16762f80bc6c3a1c65b532

7 years agoMerge "Fix typo in sync log." into oc-dr1-dev
TreeHugger Robot [Tue, 18 Jul 2017 00:07:16 +0000 (00:07 +0000)]
Merge "Fix typo in sync log." into oc-dr1-dev

7 years agoOpt-out for always-on VPN
Charles He [Mon, 15 May 2017 16:07:18 +0000 (17:07 +0100)]
Opt-out for always-on VPN

Always-on VPN is a feature introduced in N. Since then, all VPN apps
targeting N+ are assumed to support the feature, and the user or the DPC
can turn on / off always-on for any such VPN app. However, a few VPN
apps are not designed to support the always-on feature. Enabling
always-on for these apps will result in undefined behavior and confusing
"Always-on VPN disconnected" notification.

This feature provides a new manifest meta-data field through which a VPN
app can opt out of the always-on feature explicitly. This will stop the
always-on feature from being enabled for the app, both by the user and
by the DPC, and will clear its existing always-on state.

A @hide API is provided to check whether an app supports always-on VPN.
Documentation is updated to reflect the behavior change.

Bug: 36650087
Test: runtest --path java/com/android/server/connectivity/VpnTest.java
Test: cts-tradefed run cts --module CtsDevicePolicyManagerTestCases --test 'com.android.cts.devicepolicy.MixedDeviceOwnerTest#testAlwaysOnVpnUnsupportedPackage'
Test: cts-tradefed run cts --module CtsDevicePolicyManagerTestCases --test 'com.android.cts.devicepolicy.MixedDeviceOwnerTest#testAlwaysOnVpnUnsupportedPackageReplaced'
Test: cts-tradefed run cts --module CtsDevicePolicyManagerTestCases --test 'com.android.cts.devicepolicy.MixedProfileOwnerTest#testAlwaysOnVpnUnsupportedPackage'
Test: cts-tradefed run cts --module CtsDevicePolicyManagerTestCases --test 'com.android.cts.devicepolicy.MixedProfileOwnerTest#testAlwaysOnVpnUnsupportedPackageReplaced'
Test: cts-tradefed run cts --module CtsDevicePolicyManagerTestCases --test 'com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testAlwaysOnVpnUnsupportedPackage'
Test: cts-tradefed run cts --module CtsDevicePolicyManagerTestCases --test 'com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testAlwaysOnVpnUnsupportedPackageReplaced'

Change-Id: I477897a29175e3994d4ecf8ec546e26043c90f13

7 years agoMerge "Fix issue with configuration update check." into oc-dr1-dev am: 8aaa5adae6
Winson Chung [Mon, 17 Jul 2017 23:45:13 +0000 (23:45 +0000)]
Merge "Fix issue with configuration update check." into oc-dr1-dev am: 8aaa5adae6
am: d55ae0fd75

Change-Id: I26f4127e5d132f84d5963a7f520a19e593dcd235

7 years agoMerge "Fix issue with configuration update check." into oc-dr1-dev
Winson Chung [Mon, 17 Jul 2017 23:40:18 +0000 (23:40 +0000)]
Merge "Fix issue with configuration update check." into oc-dr1-dev
am: 8aaa5adae6

Change-Id: I242d4796e7b74e720daebbf274c849eb37100c03

7 years agoWebView: change setSafeBrowsingWhiteList signature
Nate Fischer [Mon, 17 Jul 2017 19:58:18 +0000 (12:58 -0700)]
WebView: change setSafeBrowsingWhiteList signature

 * Renames WhiteList -> Whitelist
 * Adds a callback to indicate malformed URLs to the application

Bug: 63660204
Bug: 63084528
Bug: 63765158
Test: N/A
Change-Id: Ia12f0822c5d3a339633a820c40bdbff4137f510b

7 years agoMerge "Fix issue with configuration update check." into oc-dr1-dev
TreeHugger Robot [Mon, 17 Jul 2017 23:30:22 +0000 (23:30 +0000)]
Merge "Fix issue with configuration update check." into oc-dr1-dev

7 years agoMake it possible to check if a given program/identifier type is supported.
Tomasz Wasilczyk [Sun, 16 Jul 2017 22:15:40 +0000 (15:15 -0700)]
Make it possible to check if a given program/identifier type is supported.

Test: instrumentalization
Bug: b/63702941
Change-Id: I436b62fa4cda8458a92a15a75543bedd43e65dcd

7 years agoFill announcement-related gaps in Broadcast Radio APIs.
Tomasz Wasilczyk [Fri, 14 Jul 2017 17:46:15 +0000 (10:46 -0700)]
Fill announcement-related gaps in Broadcast Radio APIs.

- adds TA and TP flags to ProgramInfo struct
- adds a callback to cancel announcement

Bug: b/63702941
Test: Instrumentalization, VTS
Change-Id: I09317c8ee837ee3f522037d0a727b095ef9a87a6

7 years agoDeprecate onMetadataChanged.
Tomasz Wasilczyk [Thu, 13 Jul 2017 22:59:08 +0000 (15:59 -0700)]
Deprecate onMetadataChanged.

All ProgramInfo changes are passed now by onProgramInfoChanged callback.

The onMetadataChanged callback is still called for compatibility reasons.

Bug: b/32621193
Test: instrumentalization (none added)
Change-Id: I80be8d3b55614c618514ac1e081a3ba60f4060b3

7 years agoMerge "power: throttle interaction hints" into oc-dr1-dev am: d12ecb1ed5
Tim Murray [Mon, 17 Jul 2017 23:28:05 +0000 (23:28 +0000)]
Merge "power: throttle interaction hints" into oc-dr1-dev am: d12ecb1ed5
am: d7e258116a

Change-Id: Ie12d0f6e1f212245f55b0440ffd2f696a206ce4a

7 years agoMerge "power: throttle interaction hints" into oc-dr1-dev
Tim Murray [Mon, 17 Jul 2017 23:23:37 +0000 (23:23 +0000)]
Merge "power: throttle interaction hints" into oc-dr1-dev
am: d12ecb1ed5

Change-Id: I1c83b7fd89f15e08188512156db42bed5c073b41

7 years agoImplement ProgramSelector for font-end Java APIs.
Tomasz Wasilczyk [Wed, 12 Jul 2017 20:59:20 +0000 (13:59 -0700)]
Implement ProgramSelector for font-end Java APIs.

Bug: b/32621193
Test: instrumentalization
Change-Id: Ibb9841fed76ef3568c2e36ca28ea31addf9175f1

7 years agoMerge "power: throttle interaction hints" into oc-dr1-dev
Tim Murray [Mon, 17 Jul 2017 23:16:41 +0000 (23:16 +0000)]
Merge "power: throttle interaction hints" into oc-dr1-dev

7 years agoMerge "BootReceiver: check console-ramoops-0" am: a09784ac75 am: e7715b35ea am: be25a...
Mark Salyzyn [Mon, 17 Jul 2017 23:09:44 +0000 (23:09 +0000)]
Merge "BootReceiver: check console-ramoops-0" am: a09784ac75 am: e7715b35ea am: be25a82472
am: 72c54c5113

Change-Id: I2d037b8c971cfef330e0d02045a50de759692e53

7 years agoMerge "Address post-commit review comments" am: 858634e4ec am: 5c15f6d6b1 am: 1a35cf3892
Neil Fuller [Mon, 17 Jul 2017 23:07:41 +0000 (23:07 +0000)]
Merge "Address post-commit review comments" am: 858634e4ec am: 5c15f6d6b1 am: 1a35cf3892
am: d730ad43d5

Change-Id: I3ae3b91303cb13be200a6faa7151a1474db13c68

7 years agoMerge "Merge "Merge "Merge "Remove unnecessary TODOs" am: a5c96cf4bf am: 08cff4c76b...
Android Build Merger (Role) [Mon, 17 Jul 2017 23:03:24 +0000 (23:03 +0000)]
Merge "Merge "Merge "Merge "Remove unnecessary TODOs" am: a5c96cf4bf am: 08cff4c76b" into oc-dev-plus-aosp am: c8eaf5a3a4" into oc-dr1-dev-plus-aosp am: a09fa61cb3"

7 years agoMerge "Merge "Merge "Remove unnecessary TODOs" am: a5c96cf4bf am: 08cff4c76b" into...
Neil Fuller [Mon, 17 Jul 2017 23:01:54 +0000 (23:01 +0000)]
Merge "Merge "Merge "Remove unnecessary TODOs" am: a5c96cf4bf am: 08cff4c76b" into oc-dev-plus-aosp am: c8eaf5a3a4" into oc-dr1-dev-plus-aosp
am: a09fa61cb3

Change-Id: I04cc0c73ba1cf736ed72cf1de03b02112ab9c6aa

7 years agoMerge "Merge "Merge "Docs-change: clarification of LauncherApps.getApplicationInfo...
Android Build Merger (Role) [Mon, 17 Jul 2017 23:01:14 +0000 (23:01 +0000)]
Merge "Merge "Merge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev am: d726ff988c am: 84a4d3de65" into oc-dr1-dev-plus-aosp am: 9dd37a4818"

7 years agoMerge "Add Foreground Service Timer"
Michael Wachenschwanz [Mon, 17 Jul 2017 22:59:48 +0000 (22:59 +0000)]
Merge "Add Foreground Service Timer"

7 years agoMerge "Merge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into...
Benjamin Miller [Mon, 17 Jul 2017 22:59:30 +0000 (22:59 +0000)]
Merge "Merge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev am: d726ff988c am: 84a4d3de65" into oc-dr1-dev-plus-aosp
am: 9dd37a4818

Change-Id: Iedcddce61cca507db9654e599c18c80234519bb5

7 years agoMerge "BootReceiver: check console-ramoops-0" am: a09784ac75 am: e7715b35ea
Mark Salyzyn [Mon, 17 Jul 2017 22:58:35 +0000 (22:58 +0000)]
Merge "BootReceiver: check console-ramoops-0" am: a09784ac75 am: e7715b35ea
am: be25a82472

Change-Id: I389d8faf7d30b48bfafac17251216346eb9cb713

7 years agoMerge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev...
Benjamin Miller [Mon, 17 Jul 2017 22:53:30 +0000 (22:53 +0000)]
Merge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev am: d726ff988c am: 8322920a7c
am: eb3926819a

Change-Id: Ie1b099141194525571553f46f12d7fa0e305779d

7 years agoMerge "Address post-commit review comments" am: 858634e4ec am: 5c15f6d6b1
Neil Fuller [Mon, 17 Jul 2017 22:53:29 +0000 (22:53 +0000)]
Merge "Address post-commit review comments" am: 858634e4ec am: 5c15f6d6b1
am: 1a35cf3892

Change-Id: I4f3bbd22c853b7fcb6f52e7e0543fc63712bfdbd

7 years agoMerge "Merge "Merge "Remove unnecessary TODOs" am: a5c96cf4bf am: 08cff4c76b" into...
Android Build Merger (Role) [Mon, 17 Jul 2017 22:49:53 +0000 (22:49 +0000)]
Merge "Merge "Merge "Remove unnecessary TODOs" am: a5c96cf4bf am: 08cff4c76b" into oc-dev-plus-aosp am: c8eaf5a3a4" into oc-dr1-dev-plus-aosp

7 years agoMerge "Merge "Remove unnecessary TODOs" am: a5c96cf4bf am: 08cff4c76b" into oc-dev...
Neil Fuller [Mon, 17 Jul 2017 22:48:15 +0000 (22:48 +0000)]
Merge "Merge "Remove unnecessary TODOs" am: a5c96cf4bf am: 08cff4c76b" into oc-dev-plus-aosp
am: c8eaf5a3a4

Change-Id: I49dcec61ce9b64cf105b7432d9c73cf5e3edd8e7

7 years agoMerge "Merge "Remove TODOs that are not needed" am: 0f9842304a am: 5c2cfc51c5 am...
Android Build Merger (Role) [Mon, 17 Jul 2017 22:48:03 +0000 (22:48 +0000)]
Merge "Merge "Remove TODOs that are not needed" am: 0f9842304a am: 5c2cfc51c5 am: 444616f4bf am: 34aca9e2c5  -s ours"

7 years agoMerge "Merge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into...
Android Build Merger (Role) [Mon, 17 Jul 2017 22:47:39 +0000 (22:47 +0000)]
Merge "Merge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev am: d726ff988c am: 84a4d3de65" into oc-dr1-dev-plus-aosp

7 years agoMerge "Add activity manager command to watch uid state changes."
Dianne Hackborn [Mon, 17 Jul 2017 22:47:37 +0000 (22:47 +0000)]
Merge "Add activity manager command to watch uid state changes."

7 years agoMerge "BootReceiver: check console-ramoops-0" am: a09784ac75
Mark Salyzyn [Mon, 17 Jul 2017 22:46:45 +0000 (22:46 +0000)]
Merge "BootReceiver: check console-ramoops-0" am: a09784ac75
am: e7715b35ea

Change-Id: I4ea86cc33247c2b7bf187cc8b2bc5b9c7aadc1f4

7 years agoMerge "Remove TODOs that are not needed" am: 0f9842304a am: 5c2cfc51c5 am: 444616f4bf
Neil Fuller [Mon, 17 Jul 2017 22:46:16 +0000 (22:46 +0000)]
Merge "Remove TODOs that are not needed" am: 0f9842304a am: 5c2cfc51c5 am: 444616f4bf
am: 34aca9e2c5  -s ours

Change-Id: If463092000dd2b843c6bb2ef97f5d3e7e931273b

7 years agoMerge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev...
Benjamin Miller [Mon, 17 Jul 2017 22:46:08 +0000 (22:46 +0000)]
Merge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev am: d726ff988c
am: 84a4d3de65

Change-Id: I0c2013d5243abaaa892c638fe23b9a55896b4cdc

7 years agoMerge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev...
Benjamin Miller [Mon, 17 Jul 2017 22:45:39 +0000 (22:45 +0000)]
Merge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev am: d726ff988c
am: 8322920a7c

Change-Id: I1605d6607d5057566164f03c6f9c87bfa7fa8546

7 years agoMerge "Address post-commit review comments" am: 858634e4ec
Neil Fuller [Mon, 17 Jul 2017 22:44:54 +0000 (22:44 +0000)]
Merge "Address post-commit review comments" am: 858634e4ec
am: 5c15f6d6b1

Change-Id: I967e815611149c2fd9b6ca39e9fcf9eab3b23771

7 years agoMerge "Merge "Remove unnecessary TODOs" am: a5c96cf4bf am: 08cff4c76b" into oc-dev...
Android Build Merger (Role) [Mon, 17 Jul 2017 22:41:41 +0000 (22:41 +0000)]
Merge "Merge "Remove unnecessary TODOs" am: a5c96cf4bf am: 08cff4c76b" into oc-dev-plus-aosp