OSDN Git Service
Phil Weaver [Wed, 5 Apr 2017 21:48:55 +0000 (21:48 +0000)]
Merge "Consolidate a11y unit tests and get them working" into oc-dev
am:
101b151548
Change-Id: Iae2179b65f758779979e15937c9a0c6b6f6efa4b
Roozbeh Pournader [Wed, 5 Apr 2017 21:47:49 +0000 (21:47 +0000)]
Merge "Revert "Use KB instead of kB."" into oc-dev
am:
e389f00d7f
Change-Id: I9eadb724b353f1df6c8654fedeb76dfcf22d4ed6
Todd Kennedy [Wed, 5 Apr 2017 21:42:33 +0000 (21:42 +0000)]
Merge "don't log non-instant app resolutions" into oc-dev
am:
f2e4e8ba90
Change-Id: I56342b8ec2b84855f8212d7ffc6f772c08b2b44a
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:35:05 +0000 (21:35 +0000)]
Merge "Check for null when updating header" into oc-dev
am:
010484f7c3
Change-Id: I902a5339f0d62ff14e2f9aa43eae7036d98c45e1
Sundeep Ghuman [Wed, 5 Apr 2017 21:33:31 +0000 (21:33 +0000)]
Merge "Create Espresso test for WifiSettings." into oc-dev
am:
0d47527058
Change-Id: I3691a2b57b36fc42f706f537e5274c59bb1c403d
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
Tobias Thierer [Wed, 5 Apr 2017 21:14:46 +0000 (21:14 +0000)]
Merge "Document the fact that StatFs.restat() and ctor can throw." am:
183c93f6a0 am:
e11ed001dd
am:
a426851da0
Change-Id: Ife49443ed8e5e4e90723e4e46c0e8c48a6ee5547
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
Tobias Thierer [Wed, 5 Apr 2017 21:09:14 +0000 (21:09 +0000)]
Merge "Document the fact that StatFs.restat() and ctor can throw." am:
183c93f6a0
am:
e11ed001dd
Change-Id: Ia2ee1c65e6cd7992d0761a7eeb6e9bb7964de3bc
Tobias Thierer [Wed, 5 Apr 2017 21:03:42 +0000 (21:03 +0000)]
Merge "Document the fact that StatFs.restat() and ctor can throw."
am:
183c93f6a0
Change-Id: I0c8a4c12495260044be6aac74a505280498a9b44
Tobias Thierer [Wed, 5 Apr 2017 20:53:46 +0000 (20:53 +0000)]
Merge "Document the fact that StatFs.restat() and ctor can throw."
Tenghui Zhu [Wed, 5 Apr 2017 20:52:32 +0000 (20:52 +0000)]
Merge "Make sure we handle the matrix separately for non-invertable matrix" into oc-dev
am:
399dba4ab0
Change-Id: I9ff2b46f5b06f5092e4aaca348aa021f870c7c6f
Tobias Thierer [Tue, 2 Aug 2016 15:41:11 +0000 (16:41 +0100)]
Document the fact that StatFs.restat() and ctor can throw.
StatFs.restat() and the StatFs constructor can throw
IllegalArgumentException. This was not previously documented;
not all callers took this into account, for example:
http://r.android.com/251290
This CL adds documentation to those methods. It also adds
comments to two of the callers.
Separately from this CL, we may in addition consider adding
new API StatFs.checkedRestat() and StatFs.checkedCreate()
or similar that throw IOException; we cannot change the
existing constructor and method since they are public.
Test: Checked that "make" still completed successfully.
Change-Id: I6a0b3cb7718939408937c61de7c3b000b948fa59
Christopher Tate [Wed, 5 Apr 2017 20:51:16 +0000 (20:51 +0000)]
Merge "Allow background default container service in a less crashy way" into oc-dev
am:
0283544c49
Change-Id: I863c9c8ae1d3760eb68d7169b8d60260731d6190
Adam Lesinski [Wed, 5 Apr 2017 20:50:14 +0000 (20:50 +0000)]
Merge "AAPT2: Fix pseudolocalization (again)" into oc-dev
am:
448727bdae
Change-Id: I7cb95f9fa3a92ad342a807660e8a415ca9f4fe41
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Todd Kennedy [Wed, 5 Apr 2017 19:32:23 +0000 (19:32 +0000)]
Merge "look for old intent values" into oc-dev
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
Hall Liu [Wed, 5 Apr 2017 19:23:29 +0000 (19:23 +0000)]
Merge "Query geo description in worker thread to prevent ANR"
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
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
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
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
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
Bryce Lee [Wed, 5 Apr 2017 18:07:24 +0000 (18:07 +0000)]
Merge "Fix ActivityRecordTests." into oc-dev
am:
8592407581
Change-Id: I25798368a966852c882db3e3c9362c9e17405211
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:53:28 +0000 (17:53 +0000)]
Merge changes I70f79400,I2f8cab37 into oc-dev
am:
bb790ca951
Change-Id: Ie5286397f0b0e28732e142d6cd31ccfd9d1c19a7
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
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:41:29 +0000 (17:41 +0000)]
Merge "Add AppWidgetManager#getInstalledProvidersForPackage()" into oc-dev
am:
8fdf051346
Change-Id: Ieda874c08955647005b9545fa7587e123339247b
Tony Wickham [Wed, 5 Apr 2017 17:37:11 +0000 (17:37 +0000)]
Merge "Add AppWidgetManager#getInstalledProvidersForPackage()" into oc-dev
Phil Weaver [Tue, 28 Mar 2017 23:32:43 +0000 (16:32 -0700)]
Consolidate a11y unit tests and get them working
Moving tests for accessibility manager into the a11y
directory and getting them to use some of the newer
test infrastructure. Minor tweaks to
AccessibilityManager to make it testable.
Deleting the AccessibilityManagerService tests entirely.
This class is difficult to unit test with the current
infrastructure, but is covered in CTS tests to a large
degree. I wasn't able to get these working quickly, and
they rely on timeouts that make them run much slower than
the other tests. They also throw exceptions when their
mock accessibility services receive accessibility events,
which causes the system to blacklist those services, causing
the tests to fail differently until the system is reset.
I think it's better to focus on writing new, more robust
tests than on rewriting these tests to pass.
Bug:
36614219
Test: A11y unit tests now work.
Change-Id: I8effe44f22110d55ebb700dc46f59b7e7a1aa946
(cherry picked from commit
9213d23178183981c653714f8df5806aab458bb0)
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
TreeHugger Robot [Wed, 5 Apr 2017 15:55:37 +0000 (15:55 +0000)]
Merge "Fix monkey crash" into oc-dev
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
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
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
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
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
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
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
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
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
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
Alan Viverette [Wed, 5 Apr 2017 13:54:47 +0000 (13:54 +0000)]
Merge "Automatic casts for more findViewById implementations" into oc-dev
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
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
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
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
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
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
TreeHugger Robot [Wed, 5 Apr 2017 10:04:45 +0000 (10:04 +0000)]
Merge "Pass weight/italic pair instead of style." 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
Felipe Leme [Wed, 5 Apr 2017 04:29:20 +0000 (04:29 +0000)]
Merge "Temporarily hardcoded dimensions of autofill authentication UI." 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
Wale Ogunwale [Wed, 5 Apr 2017 03:34:02 +0000 (03:34 +0000)]
Merge "Disable presubmit for ActivityRecordTests" into oc-dev
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
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
TreeHugger Robot [Wed, 5 Apr 2017 02:45:29 +0000 (02:45 +0000)]
Merge "Track pending job latency" 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
TreeHugger Robot [Wed, 5 Apr 2017 02:20:20 +0000 (02:20 +0000)]
Merge "TIF: protect PARENTAL_CONTROLS_ENABLED_CHANGED broadcast" 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
TreeHugger Robot [Wed, 5 Apr 2017 01:52:50 +0000 (01:52 +0000)]
Merge "Adds a config for default autofill service." into oc-dev
OSDN Git Service
