OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Fix NPE when adding WebView to ResourcesManager" into oc-dev
Adam Lesinski [Wed, 5 Apr 2017 20:49:06 +0000 (20:49 +0000)]
Merge "Fix NPE when adding WebView to ResourcesManager" into oc-dev
am: 7e5205137c

Change-Id: Ifb45086ba1c53e4de5abe83de66118e026c3c297

7 years agoMerge "Work on issue #36869295: com.qti.qualcomm.datastatusnotification..." into...
Dianne Hackborn [Wed, 5 Apr 2017 20:47:54 +0000 (20:47 +0000)]
Merge "Work on issue #36869295: com.qti.qualcomm.datastatusnotification..." into oc-dev
am: 36de376430

Change-Id: I96f6f541d2cf285d593f82ad548057a4873ae958

7 years agoMerge "Deliver start service args with ParcelledListSlice." into oc-dev
Dianne Hackborn [Wed, 5 Apr 2017 20:46:48 +0000 (20:46 +0000)]
Merge "Deliver start service args with ParcelledListSlice." into oc-dev
am: 1cf2c97459

Change-Id: Iacdd90c6081e93e38cfe932f5210545f33562f7a

7 years agoMerge "Fix NPE when adding WebView to ResourcesManager" 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

7 years agoMerge "Work on issue #36869295: com.qti.qualcomm.datastatusnotification..." into...
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

7 years agoWork on issue #36869295: com.qti.qualcomm.datastatusnotification...
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

7 years agoMerge "Deliver start service args with ParcelledListSlice." into oc-dev
Dianne Hackborn [Wed, 5 Apr 2017 20:37:31 +0000 (20:37 +0000)]
Merge "Deliver start service args with ParcelledListSlice." into oc-dev

7 years agoMerge changes Ibdf9cf90,I3a6dd476,Id4008fc7,Iede88d1e into oc-dev
Adrian Roos [Wed, 5 Apr 2017 20:36:49 +0000 (20:36 +0000)]
Merge changes Ibdf9cf90,I3a6dd476,Id4008fc7,Iede88d1e into oc-dev
am: debabde073

Change-Id: I9550d91619d544d80dae1de51412527733a18e80

7 years agoMerge "Removed deprecated auto(F)ill classes." into oc-dev
Felipe Leme [Wed, 5 Apr 2017 20:32:10 +0000 (20:32 +0000)]
Merge "Removed deprecated auto(F)ill classes." into oc-dev
am: b44feb154b

Change-Id: I95768d5e62af9f9fd6469b8a8e36c6e6a196091a

7 years agoMerge changes Ibdf9cf90,I3a6dd476,Id4008fc7,Iede88d1e 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

7 years agoMerge "Clear calling identity before getUserAccounts in AccountManagerService" into...
Dmitry Dementyev [Wed, 5 Apr 2017 20:26:05 +0000 (20:26 +0000)]
Merge "Clear calling identity before getUserAccounts in AccountManagerService" into oc-dev
am: 8c9f966eab

Change-Id: I96d92e870a377ac0c5b6a08d4f1affc01fa07396

7 years agoMerge "Removed deprecated auto(F)ill classes." into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 20:25:36 +0000 (20:25 +0000)]
Merge "Removed deprecated auto(F)ill classes." into oc-dev

7 years agoMerge "Clear calling identity before getUserAccounts in AccountManagerService" into...
TreeHugger Robot [Wed, 5 Apr 2017 20:18:38 +0000 (20:18 +0000)]
Merge "Clear calling identity before getUserAccounts in AccountManagerService" into oc-dev

7 years agoMerge "Tweak javadoc of setResetPasswordToken" into oc-dev
Rubin Xu [Wed, 5 Apr 2017 20:07:18 +0000 (20:07 +0000)]
Merge "Tweak javadoc of setResetPasswordToken" into oc-dev
am: ae23290ef5

Change-Id: Ib8988c2c0c07aba71fe995a64c7bb7d8fe504141

7 years agoMerge "Add storage fullness methods to volume provider." into oc-dev
Daniel Nishi [Wed, 5 Apr 2017 20:05:45 +0000 (20:05 +0000)]
Merge "Add storage fullness methods to volume provider." into oc-dev
am: 4566fd3abc

Change-Id: I8183ebd7dedf01767b046863e6e7ba1e550a9b08

7 years agoMerge "Tweak javadoc of setResetPasswordToken" into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 20:01:59 +0000 (20:01 +0000)]
Merge "Tweak javadoc of setResetPasswordToken" into oc-dev

7 years agoMerge "Add storage fullness methods to volume provider." 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

7 years agoMerge "Revert "Add a service to rank apps for ResolverActivity."" into oc-dev
Kang Li [Wed, 5 Apr 2017 19:57:08 +0000 (19:57 +0000)]
Merge "Revert "Add a service to rank apps for ResolverActivity."" into oc-dev
am: b24399547c

Change-Id: I45e96d0b5e88eb280e6dbc5981e6a6a7f1a4b6e2

7 years agoMerge "Revert "Add a service to rank apps for ResolverActivity."" into oc-dev
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

7 years agoRevert "Add a service to rank apps for ResolverActivity."
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

7 years agoMerge "Query geo description in worker thread to prevent ANR" am: eb7c287c71 am:...
Hall Liu [Wed, 5 Apr 2017 19:43:39 +0000 (19:43 +0000)]
Merge "Query geo description in worker thread to prevent ANR" am: eb7c287c71 am: 53d241411a
am: b0e36dec89

Change-Id: Idf51f20246e2bd91dcc0b65ec2102b788d9e10fe

7 years agoMerge "Query geo description in worker thread to prevent ANR" am: eb7c287c71
Hall Liu [Wed, 5 Apr 2017 19:38:07 +0000 (19:38 +0000)]
Merge "Query geo description in worker thread to prevent ANR" am: eb7c287c71
am: 53d241411a

Change-Id: If224f142cf1bb77ecf8ed515250ad5c813682eb0

7 years agoMerge "look for old intent values" into oc-dev
Todd Kennedy [Wed, 5 Apr 2017 19:38:04 +0000 (19:38 +0000)]
Merge "look for old intent values" into oc-dev
am: 1aade4e4a1

Change-Id: I3c5d202886862de4b631e23fffb357613998ac6b

7 years agoMerge "look for old intent values" into oc-dev
Todd Kennedy [Wed, 5 Apr 2017 19:32:23 +0000 (19:32 +0000)]
Merge "look for old intent values" into oc-dev

7 years agoMerge "Query geo description in worker thread to prevent ANR"
Hall Liu [Wed, 5 Apr 2017 19:32:07 +0000 (19:32 +0000)]
Merge "Query geo description in worker thread to prevent ANR"
am: eb7c287c71

Change-Id: I0df6d788ff5f8794e03324c3dacf337a7a04c36c

7 years agoMerge "Query geo description in worker thread to prevent ANR"
Hall Liu [Wed, 5 Apr 2017 19:23:29 +0000 (19:23 +0000)]
Merge "Query geo description in worker thread to prevent ANR"

7 years agoMerge "Add api to retrieve call creation time." into oc-dev
Tyler Gunn [Wed, 5 Apr 2017 18:36:44 +0000 (18:36 +0000)]
Merge "Add api to retrieve call creation time." into oc-dev
am: c85aa306c1

Change-Id: Ie3601acb589852a850d41336cad0ffe52f88ca4d

7 years agoMerge "Add api to retrieve call creation time." into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 18:29:17 +0000 (18:29 +0000)]
Merge "Add api to retrieve call creation time." into oc-dev

7 years agoNotificationViewWrapper: Fix crash for custom views
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

7 years agoClear calling identity before getUserAccounts in
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)

7 years agoRevert "Revert "AOD: Use color filter to invert icons for AOD""
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

7 years agoRevert "Revert "NotificationWrappers: Factor out doze treatment""
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

7 years agoAOD: prevent clicking shelf when dark
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

7 years agoTweak javadoc of setResetPasswordToken
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

7 years agoMerge "Do not try to restore a task id if it does not exist." into oc-dev
Bryce Lee [Wed, 5 Apr 2017 18:08:33 +0000 (18:08 +0000)]
Merge "Do not try to restore a task id if it does not exist." into oc-dev
am: 081d2ccd52

Change-Id: I2e5109329275a12ef7ce5aa550de8ef8f56ad807

7 years agoMerge "Fix ActivityRecordTests." into oc-dev
Bryce Lee [Wed, 5 Apr 2017 18:07:24 +0000 (18:07 +0000)]
Merge "Fix ActivityRecordTests." into oc-dev
am: 8592407581

Change-Id: I25798368a966852c882db3e3c9362c9e17405211

7 years agoFix NPE when adding WebView to ResourcesManager
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

7 years agoMerge "Do not try to restore a task id if it does not exist." into oc-dev
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

7 years agoMerge "Fix ActivityRecordTests." into oc-dev
Bryce Lee [Wed, 5 Apr 2017 18:00:28 +0000 (18:00 +0000)]
Merge "Fix ActivityRecordTests." into oc-dev

7 years agoMerge changes I70f79400,I2f8cab37 into oc-dev
Adrian Roos [Wed, 5 Apr 2017 17:53:28 +0000 (17:53 +0000)]
Merge changes I70f79400,I2f8cab37 into oc-dev
am: bb790ca951

Change-Id: Ie5286397f0b0e28732e142d6cd31ccfd9d1c19a7

7 years agoMerge "support notification channel for defaultcarrier app" into oc-dev
fionaxu [Wed, 5 Apr 2017 17:52:23 +0000 (17:52 +0000)]
Merge "support notification channel for defaultcarrier app" into oc-dev
am: ff16d749dd

Change-Id: I6288ecddda6a9a6c64badbcf8958ecbfe6aa77e5

7 years agoMerge changes I70f79400,I2f8cab37 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

7 years agoMerge "support notification channel for defaultcarrier app" into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 17:46:18 +0000 (17:46 +0000)]
Merge "support notification channel for defaultcarrier app" into oc-dev

7 years agoMerge "Add AppWidgetManager#getInstalledProvidersForPackage()" into oc-dev
Tony Wickham [Wed, 5 Apr 2017 17:41:29 +0000 (17:41 +0000)]
Merge "Add AppWidgetManager#getInstalledProvidersForPackage()" into oc-dev
am: 8fdf051346

Change-Id: Ieda874c08955647005b9545fa7587e123339247b

7 years agoMerge "Add AppWidgetManager#getInstalledProvidersForPackage()" into oc-dev
Tony Wickham [Wed, 5 Apr 2017 17:37:11 +0000 (17:37 +0000)]
Merge "Add AppWidgetManager#getInstalledProvidersForPackage()" into oc-dev

7 years agoMerge "Fix monkey crash" into oc-dev
Jason Monk [Wed, 5 Apr 2017 16:02:56 +0000 (16:02 +0000)]
Merge "Fix monkey crash" into oc-dev
am: c01dd791c3

Change-Id: I67f19cb80671166826e97e3e2470037b426500c4

7 years agoMerge "Fix monkey crash" into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 15:55:37 +0000 (15:55 +0000)]
Merge "Fix monkey crash" into oc-dev

7 years agoAdd api to retrieve call creation time.
Tyler Gunn [Fri, 17 Mar 2017 18:27:09 +0000 (11:27 -0700)]
Add api to retrieve call creation time.

Test: CTS
Bug: 36124432
Merged-In: Ic8288dec73adda7870377f189f560acef0a575f6
Change-Id: Ic8288dec73adda7870377f189f560acef0a575f6

7 years agoFix ActivityRecordTests.
Bryce Lee [Wed, 5 Apr 2017 15:39:40 +0000 (08:39 -0700)]
Fix ActivityRecordTests.

Tests are not guaranteed to run on the same thread as setup methods.
Therefore, we must ensure any loopers used are already created by the
time the test runs. We do this now by creating a HandlerThread and
referencing its Looper later. Loopers are initialized per
HandlerThread, which will allow us to both isolate its usage and
guarantee the Looper initialization by test time.

Change-Id: If15494783959e5c399375033253cef69b921ff84
Fixes: 36916522
Test: bit FrameworksServicesTests:com.android.server.am.ActivityRecordTests

7 years agoMerge "Make sure to remove child views when recreating notification menu row" into...
Mady Mellor [Wed, 5 Apr 2017 15:26:15 +0000 (15:26 +0000)]
Merge "Make sure to remove child views when recreating notification menu row" into oc-dev
am: 1e943b3ef0

Change-Id: I6aa4903673eaf099a77eaf90d95abfacca550ea3

7 years agoMerge "Inline Controls hide Settings button when no appropriate link." into oc-dev
Geoffrey Pitsch [Wed, 5 Apr 2017 15:25:16 +0000 (15:25 +0000)]
Merge "Inline Controls hide Settings button when no appropriate link." into oc-dev
am: 18cbccbfb0

Change-Id: Ic0aff571bdb29570e2e5b56a5ce76c75d27f69e3

7 years agoMerge "Corrected alert window text based on UX feedback." into oc-dev
Wale Ogunwale [Wed, 5 Apr 2017 15:24:14 +0000 (15:24 +0000)]
Merge "Corrected alert window text based on UX feedback." into oc-dev
am: 2075b09c62

Change-Id: I4cf2e5d489cb35c16f87b4dc68665c7a73c10ddf

7 years agoMerge "Make sure to remove child views when recreating notification menu row" into...
TreeHugger Robot [Wed, 5 Apr 2017 15:20:45 +0000 (15:20 +0000)]
Merge "Make sure to remove child views when recreating notification menu row" into oc-dev

7 years agoMerge "Inline Controls hide Settings button when no appropriate link." into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 15:18:34 +0000 (15:18 +0000)]
Merge "Inline Controls hide Settings button when no appropriate link." into oc-dev

7 years agoMerge "Corrected alert window text based on UX feedback." into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 15:18:07 +0000 (15:18 +0000)]
Merge "Corrected alert window text based on UX feedback." into oc-dev

7 years agolook for old intent values
Todd Kennedy [Wed, 5 Apr 2017 14:44:19 +0000 (07:44 -0700)]
look for old intent values

the instant app installer/resolver/setting components haven't updated
to the new values yet. Need to continue looking for the previous intent
values.

Test: boot and see ephemeral enabled
Change-Id: Id88191a4878a138fa90bbd9816805ff76665ada9

7 years agoMerge "Automatic casts for more findViewById implementations" into oc-dev
Alan Viverette [Wed, 5 Apr 2017 13:58:51 +0000 (13:58 +0000)]
Merge "Automatic casts for more findViewById implementations" into oc-dev
am: 7458ea3827

Change-Id: I7c77634f1a5b2551830796118e1fe69d389d6884

7 years agoMerge "Automatic casts for more findViewById implementations" into oc-dev
Alan Viverette [Wed, 5 Apr 2017 13:54:47 +0000 (13:54 +0000)]
Merge "Automatic casts for more findViewById implementations" into oc-dev

7 years agoCorrected alert window text based on UX feedback.
Wale Ogunwale [Wed, 5 Apr 2017 13:08:53 +0000 (06:08 -0700)]
Corrected alert window text based on UX feedback.

Fixes: 36813743
Test: Text change only.
Change-Id: I7431ca568474f8fed242a94d68e7a5ea6b289b8c

7 years agoMerge "Updating javadoc string for DevicePolicyManager.EXTRA_PROVISIONING_SUPPORT_URL...
Alejandro Fernández [Wed, 5 Apr 2017 11:31:29 +0000 (11:31 +0000)]
Merge "Updating javadoc string for DevicePolicyManager.EXTRA_PROVISIONING_SUPPORT_URL to indicate that only HTTPS urls are supported." into oc-dev
am: 8d41ad08c0

Change-Id: I2a0f80a5da207243aa39c6d19e0743261f655f62

7 years agoMerge "Updating javadoc string for DevicePolicyManager.EXTRA_PROVISIONING_SUPPORT_URL...
TreeHugger Robot [Wed, 5 Apr 2017 11:25:26 +0000 (11:25 +0000)]
Merge "Updating javadoc string for DevicePolicyManager.EXTRA_PROVISIONING_SUPPORT_URL to indicate that only HTTPS urls are supported." into oc-dev

7 years agoMerge "Update to latest tzdata / switch back to zones.tab" into oc-dev
Neil Fuller [Wed, 5 Apr 2017 10:39:28 +0000 (10:39 +0000)]
Merge "Update to latest tzdata / switch back to zones.tab" into oc-dev
am: 0a49354820

Change-Id: I2d5a0d65ecb2da43f4da92cb56f7f416a855ef3a

7 years agoMerge "Update to latest tzdata / switch back to zones.tab" into oc-dev
Neil Fuller [Wed, 5 Apr 2017 10:33:45 +0000 (10:33 +0000)]
Merge "Update to latest tzdata / switch back to zones.tab" into oc-dev

7 years agoMerge "Pass weight/italic pair instead of style." into oc-dev
Seigo Nonaka [Wed, 5 Apr 2017 10:12:26 +0000 (10:12 +0000)]
Merge "Pass weight/italic pair instead of style." into oc-dev
am: b4e3b344fa

Change-Id: I9d430af9489878fd0c7eb8d26dce186a13059450

7 years agoMerge "Pass weight/italic pair instead of style." into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 10:04:45 +0000 (10:04 +0000)]
Merge "Pass weight/italic pair instead of style." into oc-dev

7 years agoMerge "Temporarily hardcoded dimensions of autofill authentication UI." into oc-dev
Felipe Leme [Wed, 5 Apr 2017 04:34:36 +0000 (04:34 +0000)]
Merge "Temporarily hardcoded dimensions of autofill authentication UI." into oc-dev
am: 24bac61498

Change-Id: Ifb07238314f220ee97f1677e2005ac00a613c1e2

7 years agoMerge "Temporarily hardcoded dimensions of autofill authentication UI." into oc-dev
Felipe Leme [Wed, 5 Apr 2017 04:29:20 +0000 (04:29 +0000)]
Merge "Temporarily hardcoded dimensions of autofill authentication UI." into oc-dev

7 years agoMerge "Disable presubmit for ActivityRecordTests" into oc-dev
Wale Ogunwale [Wed, 5 Apr 2017 03:40:04 +0000 (03:40 +0000)]
Merge "Disable presubmit for ActivityRecordTests" into oc-dev
am: ef3874ba91

Change-Id: Ib2ec81465005ac046e6ed622bf2f1f92d463c284

7 years agoMerge "Disable presubmit for ActivityRecordTests" into oc-dev
Wale Ogunwale [Wed, 5 Apr 2017 03:34:02 +0000 (03:34 +0000)]
Merge "Disable presubmit for ActivityRecordTests" into oc-dev

7 years agoDisable presubmit for ActivityRecordTests
Wale Ogunwale [Wed, 5 Apr 2017 03:30:18 +0000 (20:30 -0700)]
Disable presubmit for ActivityRecordTests

Failing in CI

Test: ActivityRecordTests
Bug: 36916522
Change-Id: Id5571b722cc5c14f2897fcc65d52d35bf4a78105

7 years agoMerge "Track pending job latency" into oc-dev
Christopher Tate [Wed, 5 Apr 2017 02:50:56 +0000 (02:50 +0000)]
Merge "Track pending job latency" into oc-dev
am: 0704a9e56a

Change-Id: Iff9894317a65994ff823055daff6b5bda6487978

7 years agoMerge "Track pending job latency" into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 02:45:29 +0000 (02:45 +0000)]
Merge "Track pending job latency" into oc-dev

7 years agoMerge "TIF: protect PARENTAL_CONTROLS_ENABLED_CHANGED broadcast" into oc-dev
Conrad Chen [Wed, 5 Apr 2017 02:25:31 +0000 (02:25 +0000)]
Merge "TIF: protect PARENTAL_CONTROLS_ENABLED_CHANGED broadcast" into oc-dev
am: 044eeecc1d

Change-Id: I4caef36d3cee02d8912cfa7e02681fb404007567

7 years agoMerge "TIF: protect PARENTAL_CONTROLS_ENABLED_CHANGED broadcast" into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 02:20:20 +0000 (02:20 +0000)]
Merge "TIF: protect PARENTAL_CONTROLS_ENABLED_CHANGED broadcast" into oc-dev

7 years agoMerge "Adds a config for default autofill service." into oc-dev
Felipe Leme [Wed, 5 Apr 2017 02:01:36 +0000 (02:01 +0000)]
Merge "Adds a config for default autofill service." into oc-dev
am: 045c71f1be

Change-Id: I3f92aff715d9a9a9e7d2c96f6eb60f7b86e9b9d3

7 years agoMerge "Adds a config for default autofill service." into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 01:52:50 +0000 (01:52 +0000)]
Merge "Adds a config for default autofill service." into oc-dev

7 years agoMerge "Audio focus: duck new players during the ducked phase" into oc-dev
Jean-Michel Trivi [Wed, 5 Apr 2017 01:46:50 +0000 (01:46 +0000)]
Merge "Audio focus: duck new players during the ducked phase" into oc-dev
am: a6c7f413f8

Change-Id: Icefeba66e1bdda26d2e89d2087dd251c0003e2eb

7 years agoMerge "Audio focus: duck new players during the ducked phase" into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 01:40:13 +0000 (01:40 +0000)]
Merge "Audio focus: duck new players during the ducked phase" into oc-dev

7 years agoMerge "Add a feature flag for CTS." into oc-dev
Sam Lin [Wed, 5 Apr 2017 01:37:26 +0000 (01:37 +0000)]
Merge "Add a feature flag for CTS." into oc-dev
am: 9ff3ec4872

Change-Id: I1b2e8026cf2db083fb17ab03d0e1972addffdbbb

7 years agoMerge "Add a feature flag for CTS." into oc-dev
Sam Lin [Wed, 5 Apr 2017 01:29:15 +0000 (01:29 +0000)]
Merge "Add a feature flag for CTS." into oc-dev

7 years agoRemoved deprecated auto(F)ill classes.
Felipe Leme [Tue, 4 Apr 2017 22:07:13 +0000 (15:07 -0700)]
Removed deprecated auto(F)ill classes.

Bug: 35956626
Test: manual verification
Test: CtsAutoFillServiceTestCases pass
Change-Id: Icb622589c41e6a286d51e3f85bd5a813e483b5ea

7 years agoAOD: Adjust header to spec
Adrian Roos [Tue, 4 Apr 2017 22:12:52 +0000 (15:12 -0700)]
AOD: Adjust header to spec

- factor out attributes to themes
- use themeing to change ambient header to larger text and icon size

Bug: 30876804
Test: receive notification on ambient screen, observe that header text is slightly larger
Change-Id: I70f79400e2ce47b862b3b501421aa71187866e61

7 years agoMerge "Remove useless GraphicBuffer() constructor" into oc-dev
Mathias Agopian [Wed, 5 Apr 2017 00:52:39 +0000 (00:52 +0000)]
Merge "Remove useless GraphicBuffer() constructor" into oc-dev
am: 810e018e24

Change-Id: I630b623bc188301bc65e865f0298031ed9425cec

7 years agoMerge "Don't crash when passing null to requestChildFocus" into oc-dev
Adam Powell [Wed, 5 Apr 2017 00:50:12 +0000 (00:50 +0000)]
Merge "Don't crash when passing null to requestChildFocus" into oc-dev
am: df50b64860

Change-Id: I77afb7ee544c08cdc927b0b2e66aa3f229a72892

7 years agoMerge "Don't broadcast PACKAGE_REMOVED for InstantApps" into oc-dev
Todd Kennedy [Wed, 5 Apr 2017 00:45:56 +0000 (00:45 +0000)]
Merge "Don't broadcast PACKAGE_REMOVED for InstantApps" into oc-dev
am: b28e1e68d2

Change-Id: Id73d7aa14cbb20fe335270fbd2f05a8ed5606eb9

7 years agoMerge "Remove useless GraphicBuffer() constructor" into oc-dev
Mathias Agopian [Wed, 5 Apr 2017 00:42:52 +0000 (00:42 +0000)]
Merge "Remove useless GraphicBuffer() constructor" into oc-dev

7 years agoMerge "Don't crash when passing null to requestChildFocus" into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 00:42:34 +0000 (00:42 +0000)]
Merge "Don't crash when passing null to requestChildFocus" into oc-dev

7 years agoMerge "Add @TestApi annotations to CS-side RTT APIs for CTS" am: f6f3c16dfb am: 6689b...
Hall Liu [Wed, 5 Apr 2017 00:40:22 +0000 (00:40 +0000)]
Merge "Add @TestApi annotations to CS-side RTT APIs for CTS" am: f6f3c16dfb am: 6689b57b66
am: bd2cf664ca

Change-Id: I22bd2201b0cc2b3bcbf8d1eb740a91485735d03f

7 years agoMerge "Don't broadcast PACKAGE_REMOVED for InstantApps" into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 00:37:48 +0000 (00:37 +0000)]
Merge "Don't broadcast PACKAGE_REMOVED for InstantApps" into oc-dev

7 years agoTrack pending job latency
Christopher Tate [Tue, 4 Apr 2017 00:36:07 +0000 (17:36 -0700)]
Track pending job latency

Timestamp jobs being marked 'pending' and 'active,' so we can then report their
pending latency in dumpsys.

Bug 35385393
Test: N/A

Change-Id: I3d981fbc7fbe6abdf30da3f86d88d3733b797f51

7 years agoMerge "show different timing log for shutdown animation" into oc-dev
Keun-young Park [Wed, 5 Apr 2017 00:34:19 +0000 (00:34 +0000)]
Merge "show different timing log for shutdown animation" into oc-dev
am: 0e59ab0408

Change-Id: If511a7732730cc3a15c21ab716083417d9d46728

7 years agoMerge "show different timing log for shutdown animation" into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 00:29:55 +0000 (00:29 +0000)]
Merge "show different timing log for shutdown animation" into oc-dev

7 years agoTIF: protect PARENTAL_CONTROLS_ENABLED_CHANGED broadcast
Conrad Chen [Tue, 4 Apr 2017 22:24:07 +0000 (15:24 -0700)]
TIF: protect PARENTAL_CONTROLS_ENABLED_CHANGED broadcast

Test: build and test manually to see if warnings are eliminated
Bug: 36898338
Change-Id: Ifea0844926677fad24f7df2ade31cd299099b639

7 years agosupport notification channel for defaultcarrier app
fionaxu [Tue, 4 Apr 2017 21:13:11 +0000 (14:13 -0700)]
support notification channel for defaultcarrier app

Apps posting notifications for O must supply a notification channel for
all notifications

Bug: 36895752
Change-Id: I7ec3b4cd8a6ea05c3ca9316d1f79b56e3531f5d0

7 years agoMerge "move ACTION_SERVICE_STATE to system api" into oc-dev
Chen Xu [Tue, 4 Apr 2017 23:49:02 +0000 (23:49 +0000)]
Merge "move ACTION_SERVICE_STATE to system api" into oc-dev
am: 5effb5f645

Change-Id: I5b61b20b646a9bfae4e0f89c70f7af71f626c740

7 years agoMerge "Add @TestApi annotations to CS-side RTT APIs for CTS" am: f6f3c16dfb
Hall Liu [Tue, 4 Apr 2017 23:45:39 +0000 (23:45 +0000)]
Merge "Add @TestApi annotations to CS-side RTT APIs for CTS" am: f6f3c16dfb
am: 6689b57b66

Change-Id: I35ec391a2edcc4d64bc7330415505f700b90a568

7 years agoMerge "AOD: update AOD2 views to spec" into oc-dev
Adrian Roos [Tue, 4 Apr 2017 23:44:39 +0000 (23:44 +0000)]
Merge "AOD: update AOD2 views to spec" into oc-dev
am: 146293b35c

Change-Id: I383dae263347ea0719bbbb8af07e6d0a665aee27

7 years agoMerge "move ACTION_SERVICE_STATE to system api" into oc-dev
Chen Xu [Tue, 4 Apr 2017 23:43:51 +0000 (23:43 +0000)]
Merge "move ACTION_SERVICE_STATE to system api" into oc-dev

7 years agoMerge "AOD: update AOD2 views to spec" into oc-dev
Adrian Roos [Tue, 4 Apr 2017 23:38:38 +0000 (23:38 +0000)]
Merge "AOD: update AOD2 views to spec" into oc-dev

7 years agoMerge "Add @TestApi annotations to CS-side RTT APIs for CTS"
Hall Liu [Tue, 4 Apr 2017 23:38:39 +0000 (23:38 +0000)]
Merge "Add @TestApi annotations to CS-side RTT APIs for CTS"
am: f6f3c16dfb

Change-Id: I510ed2b8dfdbbb3563cd31c8630973790eae023d