OSDN Git Service
Winson Chung [Sat, 10 Jun 2017 04:56:09 +0000 (04:56 +0000)]
Merge "Preemptively create Bitmap from GraphicBuffer" into oc-dev
am:
a304564081
Change-Id: I916e692fae56ed79a60d37b471b6e07457d2509d
Winson Chung [Sat, 10 Jun 2017 04:50:09 +0000 (04:50 +0000)]
Merge "Preemptively create Bitmap from GraphicBuffer" into oc-dev
Ben Gruver [Sat, 10 Jun 2017 00:45:04 +0000 (00:45 +0000)]
Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev
am:
ffd8343ba8
Change-Id: Ia3b7fe1bad2f3c2d13ce58f97174511ed8434e0b
Ben Gruver [Sat, 10 Jun 2017 00:38:54 +0000 (00:38 +0000)]
Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev
George Mount [Fri, 9 Jun 2017 23:49:21 +0000 (23:49 +0000)]
Merge "Add target sdk check for behavior change." into oc-dev
am:
e5e246ce5c
Change-Id: I3734ee5cd46536a015a8fc60bf8b57818800c792
George Mount [Fri, 9 Jun 2017 23:41:40 +0000 (23:41 +0000)]
Merge "Add target sdk check for behavior change." into oc-dev
Jorim Jaggi [Fri, 9 Jun 2017 23:33:16 +0000 (23:33 +0000)]
Merge "Fix thread booster" into oc-dev
am:
4c1209e00e
Change-Id: I3ef8bce9cd703a630280595a47baebae12c28387
Lucas Dupin [Fri, 9 Jun 2017 23:26:36 +0000 (23:26 +0000)]
Merge "Removed test from presubmit." into oc-dev
am:
4f30aa2be8
Change-Id: I3f73f3581fad4575f774f2c5ba870cc3308443a4
Jorim Jaggi [Fri, 9 Jun 2017 23:23:56 +0000 (23:23 +0000)]
Merge "Fix thread booster" into oc-dev
Hugo Benichi [Fri, 9 Jun 2017 23:17:22 +0000 (23:17 +0000)]
Merge "Instrument captive portal login activity" into oc-dr1-dev
TreeHugger Robot [Fri, 9 Jun 2017 23:17:13 +0000 (23:17 +0000)]
Merge "Removed test from presubmit." into oc-dev
Daniel Sandler [Fri, 9 Jun 2017 23:05:29 +0000 (23:05 +0000)]
Merge "" into oc-dev
am:
0aaae4ae78
Change-Id: Ibeceac21612da6669d0a216729c2671170651480
Daniel Sandler [Fri, 9 Jun 2017 22:55:42 +0000 (22:55 +0000)]
Merge "🐙" into oc-dev
Felipe Leme [Fri, 9 Jun 2017 22:13:59 +0000 (22:13 +0000)]
Merge "Minor fix on autofill() javadoc." into oc-dev
am:
211e760408
Change-Id: I1dddd4e6a326ccd0fb6f57dbd30b0c4ba0d08106
Felipe Leme [Fri, 9 Jun 2017 22:02:40 +0000 (22:02 +0000)]
Merge "Minor fix on autofill() javadoc." into oc-dev
Todd Lee [Fri, 9 Jun 2017 22:01:45 +0000 (22:01 +0000)]
Add missing values for screen percent width dimens am:
5fc6653ea7 am:
a58e208394
am:
1b39c88b97
Change-Id: I62c0a5776bf6307d8d9e580b7d5592352e2efdc8
Siyamed Sinir [Fri, 9 Jun 2017 21:56:09 +0000 (21:56 +0000)]
Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev
am:
bc626c6358
Change-Id: I4d3cff4bf6a0403f311011709c3074bca532de15
Svetoslav Ganov [Fri, 9 Jun 2017 21:49:49 +0000 (21:49 +0000)]
Merge "Protect autofill UI against redressing" into oc-dev
am:
0541862ec5
Change-Id: I07b91f8baa721b58f7f0ff9bf90a29481fdedaac
Lei Yu [Fri, 9 Jun 2017 21:42:25 +0000 (21:42 +0000)]
Merge changes from topic 'battery_smear_move' into oc-dev
am:
883db32859
Change-Id: I45d4eaadbc992663b3453b52c391d5d4d660e046
jackqdyulei [Fri, 9 Jun 2017 21:41:14 +0000 (21:41 +0000)]
Copy smearing method to BatteryStatsHelper
am:
5dad8068e2 -s ours
Change-Id: I07d9a563f224d739e734af92ae5078d8c6f41100
Winson Chung [Fri, 9 Jun 2017 21:38:39 +0000 (14:38 -0700)]
Preemptively create Bitmap from GraphicBuffer
- This call moves up the code to create a ThumbnailData from the
TaskSnapshot to ensure that it is registered with the GC even if there
is no active TaskView bound to process the event.
Bug:
62360156
Test: Run "bit CtsMediaTestCases:.DecodeAccuracyTest", and ensure that
the "Lost RAM" is relatively unchanged afterwards
Change-Id: I64af55aa40e80604864e17045798823cc6fee483
Todd Lee [Fri, 9 Jun 2017 21:16:04 +0000 (21:16 +0000)]
Add missing values for screen percent width dimens am:
5fc6653ea7
am:
a58e208394
Change-Id: I0bd6a5e8fe67439d823068229f4bbd828560d7c1
Felipe Leme [Fri, 9 Jun 2017 21:12:03 +0000 (21:12 +0000)]
Merge "Closes Autofill UIs when back button is pressed." into oc-dev
am:
8db148093c
Change-Id: I966af17b26d67f7f29290ee73053e1b833a6623a
Lucas Dupin [Fri, 9 Jun 2017 21:10:33 +0000 (14:10 -0700)]
Removed test from presubmit.
testOnNotification_stillWorksAfterOneFailedProxCheck needs to
be ignored on presubmit runs. It fails on Tree Hugger but
runs locally.
Test: runtest systemui
Change-Id: Id4e1107528715c7e0b6ce7c69e2da7fa837e79a2
Todd Lee [Fri, 9 Jun 2017 21:07:04 +0000 (21:07 +0000)]
Add missing values for screen percent width dimens
am:
5fc6653ea7
Change-Id: Icecf451c5cb97275234f75f55292729a5f213560
Felipe Leme [Fri, 9 Jun 2017 21:03:27 +0000 (21:03 +0000)]
Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev
am:
e4835a2af4
Change-Id: If88ec9c1de2d81d5b629ed0ead8c9911e6f2c0c5
Chen Xu [Fri, 9 Jun 2017 21:00:26 +0000 (21:00 +0000)]
Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev
am:
cdec393aa3
Change-Id: I2e175c9a475d2cc2ad225154dbc5c2f855173975
Siyamed Sinir [Fri, 9 Jun 2017 20:58:30 +0000 (20:58 +0000)]
Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev
Hemant Gupta [Fri, 9 Jun 2017 20:57:41 +0000 (20:57 +0000)]
OBEX: Add required parameters TAG ID's for PBAP 1.2
am:
6f2b75f574
Change-Id: I8dce42c762758a5ab2ca09b92301697af4d29a8a
Ben Gruver [Thu, 8 Jun 2017 22:54:48 +0000 (15:54 -0700)]
Don't reset the value of package_verifier_enable if not in demo mode
Also, use the correct default value when querying the setting when
starting demo mode.
BUG:
62346506
Test: manually flash and run through setup wizard
Change-Id: Ie9a5ae8a998eb267fcf1f509cb93ea6f566b3c96
TreeHugger Robot [Fri, 9 Jun 2017 20:54:19 +0000 (20:54 +0000)]
Merge "Add IApnSourceService.aidl" into oc-dr1-dev
Svetoslav Ganov [Fri, 9 Jun 2017 20:53:26 +0000 (20:53 +0000)]
Merge "Protect autofill UI against redressing" into oc-dev
Lei Yu [Fri, 9 Jun 2017 20:50:36 +0000 (20:50 +0000)]
Merge changes from topic 'battery_smear_move' into oc-dev
* changes:
Batterystats logs smeared power model values
Copy smearing method to BatteryStatsHelper
Jeff Sharkey [Fri, 9 Jun 2017 20:23:14 +0000 (20:23 +0000)]
Merge "Omit icons from bulk SessionInfo calls." into oc-dr1-dev
Dan Sandler [Fri, 9 Jun 2017 03:52:45 +0000 (23:52 -0400)]
🐙
It's convenient that this release is Android 8.
Bug:
32956843
Test: adb shell am start \
-a android.intent.action.MAIN \
-c com.android.internal.category.PLATLOGO
Change-Id: I9bb02b212fa241c17f03ef11c5c52dba0e6a746e
Felipe Leme [Fri, 9 Jun 2017 19:47:52 +0000 (19:47 +0000)]
Merge "Closes Autofill UIs when back button is pressed." into oc-dev
Felipe Leme [Fri, 9 Jun 2017 19:42:13 +0000 (19:42 +0000)]
Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev
Chen Xu [Fri, 9 Jun 2017 19:39:50 +0000 (19:39 +0000)]
Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev
Jorim Jaggi [Fri, 9 Jun 2017 19:00:58 +0000 (12:00 -0700)]
Fix thread booster
We need to conditionally set the prevPriority only if we enter
the first locked section. Otherwise we'll never reset back to the
lower priorities.
Test: Make sure no binder threads are stuck at 110.
Test: go/wm-smoke
Bug:
36631902
Change-Id: I8a9c329bc3084371022da91eabee45943c1b8c9f
Todd Lee [Wed, 3 May 2017 23:22:42 +0000 (16:22 -0700)]
Add missing values for screen percent width dimens
Protects against bootlooping in the event that developer
inadvertently changes DPI to unsupported value for device.
Use 0dp as it will not be mistaken for anything other
than a broken experience (cts test to validate device DPIs
so as to avoid shipping with this).
bug: b/
37755288
Change-Id: Ie9f4aa0d6d226383824e06d28151e06038d0110b
Hemant Gupta [Sat, 17 Oct 2015 14:10:53 +0000 (19:40 +0530)]
OBEX: Add required parameters TAG ID's for PBAP 1.2
Add required OBEX application parameters TAGID's and length
declarations required to support PBAP 1.2 specification.
Test: Connected with Remote PBAP Client supporting PBAP 1.2 and
verified that connection and transfer happens over L2CAP.
Connected with Remote PBAP Client supporting PBAP 1.1 and
and verified that connection and transfer happens over RFCOMM.
TestTracker: 89053
Bug:
33011817
Change-Id: I8a772b0dddf6ecf74b057e12d7596421c0e0f558
(cherry picked from commit
9e91b62c1fa4f6c51f53ddb3f2155f345be30a2a)
Winson Chung [Fri, 9 Jun 2017 17:56:26 +0000 (17:56 +0000)]
Merge "Removing legacy default thumbnail logic." into oc-dev
am:
a0e44e7335
Change-Id: I5bcc319b92c464c28ff4db6c94cf297e786b50d7
Winson Chung [Fri, 9 Jun 2017 17:50:44 +0000 (17:50 +0000)]
Merge "Removing legacy default thumbnail logic." into oc-dev
Lei Yu [Fri, 9 Jun 2017 17:46:26 +0000 (17:46 +0000)]
Merge "Copy smearing method to BatteryStatsHelper" into oc-dr1-dev
Jordan Liu [Tue, 23 May 2017 20:07:07 +0000 (13:07 -0700)]
Add IApnSourceService.aidl
This service is bound to by TelephonyProvider on devices where we don't
use the apns-conf.xml file.
Bug:
37283190
Test: manual
Change-Id: I16da1c5acc5ba1fe0237cc0d37c73d831c2d1508
Merged-In: I16da1c5acc5ba1fe0237cc0d37c73d831c2d1508
Clara Bayarri [Fri, 9 Jun 2017 17:37:59 +0000 (17:37 +0000)]
Merge "Replace fonts of unknown origin" into oc-dev
am:
3eae564fec
Change-Id: I9993d1afdbf3cd88cfd1861872baa7b0ee23e7ba
Clara Bayarri [Fri, 9 Jun 2017 17:31:14 +0000 (17:31 +0000)]
Merge "Replace fonts of unknown origin" into oc-dev
Jason Monk [Fri, 9 Jun 2017 16:57:44 +0000 (16:57 +0000)]
Merge "Add notification listener plugin hook" into oc-dr1-dev
Bill Yi [Fri, 9 Jun 2017 16:10:02 +0000 (16:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
728c610446 -s ours
Change-Id: Ide88aef2c9d0a04ed9376fcb45d3277f9e749afa
TreeHugger Robot [Fri, 9 Jun 2017 16:02:23 +0000 (16:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Sungsoo Lim [Fri, 9 Jun 2017 15:42:50 +0000 (15:42 +0000)]
Merge "Fix the finding logic of MediaButtonSession" into oc-dev
am:
9cfd30202d
Change-Id: I5a12aef2922ccc468469c3b32f2fddda8e044fa0
Sungsoo Lim [Fri, 9 Jun 2017 15:38:42 +0000 (15:38 +0000)]
Merge "Fix the finding logic of MediaButtonSession" into oc-dev
Bill Yi [Fri, 9 Jun 2017 14:01:59 +0000 (07:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I868ab44fa40985282a8a7b46ea94d951d18e4fd3
Auto-generated-cl: translation import
Wale Ogunwale [Fri, 9 Jun 2017 13:15:38 +0000 (13:15 +0000)]
Merge "Fix deadlock when create alert window notification" into oc-dev
am:
678477b383
Change-Id: I2c6149881b738777ed309209538c5d9726d36c36
Wale Ogunwale [Fri, 9 Jun 2017 13:07:13 +0000 (13:07 +0000)]
Merge "Fix deadlock when create alert window notification" into oc-dev
Bryce Lee [Fri, 9 Jun 2017 11:18:04 +0000 (11:18 +0000)]
Merge "Prioritize reused activity's stack over computed stack." into oc-dev
am:
ac56b8adde
Change-Id: I78c8fc62d4050546896262245785084fd5cab609
Bryce Lee [Fri, 9 Jun 2017 11:11:12 +0000 (11:11 +0000)]
Merge "Prioritize reused activity's stack over computed stack." into oc-dev
Romain Guy [Fri, 9 Jun 2017 06:34:35 +0000 (06:34 +0000)]
Merge "Fix CTS : BitmapRGBAF16Test#testSetPixel failure" into oc-dr1-dev
fionaxu [Thu, 8 Jun 2017 22:48:05 +0000 (15:48 -0700)]
add an extra for rebroadcast of SIM_STATE_CHANGED
Bug:
62459330
Test: Manaual Test
Change-Id: I0e1c676d99a38273047a84d4467cff44dae7c5af
Sungsoo [Fri, 9 Jun 2017 03:59:47 +0000 (12:59 +0900)]
Fix the finding logic of MediaButtonSession
When we find a media button session with the given UID, we should
ignore the sessions whose playback state is not set.
Bug:
62373831
Test: passed CtsMediaTestCases
Change-Id: I484c888c5bdbceb85dd4524c1353906efc0c4f02
Selim Cinek [Fri, 9 Jun 2017 04:36:31 +0000 (04:36 +0000)]
Merge "Fixed an issue where the notification could stay userlocked" into oc-dev
am:
dc66506f0a
Change-Id: Ia2ea2f1b69bdcab2d27a56e89fbfb87b8cc11eed
Selim Cinek [Fri, 9 Jun 2017 04:30:47 +0000 (04:30 +0000)]
Merge "Fixed a bug where systemui could crash while cloning" into oc-dev
am:
b9eb205bd7
Change-Id: I6cd3b23a9adcb20a93b112204154f1e42a7a3c21
Selim Cinek [Fri, 9 Jun 2017 04:25:36 +0000 (04:25 +0000)]
Merge "Fixed an issue where the notification could stay userlocked" into oc-dev
Selim Cinek [Fri, 9 Jun 2017 04:21:59 +0000 (04:21 +0000)]
Merge "Fixed a bug where systemui could crash while cloning" into oc-dev
Jorim Jaggi [Fri, 9 Jun 2017 04:15:12 +0000 (04:15 +0000)]
Merge "Properly run window animations at vsync-sf (1/2)" into oc-dev
am:
d1f55f6302
Change-Id: Ibbb9214593ee1b5dd51a0b0da8815c270b875257
Jorim Jaggi [Fri, 9 Jun 2017 04:11:31 +0000 (04:11 +0000)]
Merge "Boost android.anim and wm lock sections to -10 during transition" into oc-dev
am:
713ad88afe
Change-Id: Ie76d079092805920ebd6820ce412691ccdceb039
Jorim Jaggi [Fri, 9 Jun 2017 04:06:38 +0000 (04:06 +0000)]
Merge "Properly run window animations at vsync-sf (1/2)" into oc-dev
Jorim Jaggi [Fri, 9 Jun 2017 04:05:31 +0000 (04:05 +0000)]
Merge "Boost android.anim and wm lock sections to -10 during transition" into oc-dev
Hugo Benichi [Mon, 5 Jun 2017 05:52:24 +0000 (14:52 +0900)]
Instrument captive portal login activity
Also add CAPTIVE_PORTAL_LOGIN_ACTIVITY_SSL_ERROR constants to
metrics_constants.proto for counting ssl error pages shown by the
captive portal login activity.
Bug:
36203355
Bug:
34901696
Bug:
36532213
Test: manually tested with captive portal testing setup while watching
event logs: adb logcat -b events | grep captiveportallogin
06-08 16:25:20.279 21558 21558 I sysui_action: [1004,com.android.captiveportallogin]
06-08 17:01:04.052 21558 21558 I sysui_action: [1007,com.android.captiveportallogin]
Change-Id: Ia05853506d424ad4cb2c11770ae7718fbef3f01c
(cherry picked from commit
c61dc92fc0619d101c4b789f6305012701cc47a0)
Felipe Leme [Fri, 9 Jun 2017 01:50:05 +0000 (18:50 -0700)]
Minor fix on autofill() javadoc.
Bug:
62465574
Test: N/A
Change-Id: I4a55b4064a8af835e962a77c6ad55a29c1954efd
Felipe Leme [Fri, 9 Jun 2017 01:12:32 +0000 (18:12 -0700)]
Ignore dispatchProvideStructureForAutofill() when layout is being updated.
View already checks if its layout is being updated when calling
notifyEnterOrExitForAutoFillIfNeeded(), but that doesn't prevent apps crashing
when the autofill process was triggered by another view.
Test: existing CtsAutoFillServiceTestCases pass
Fixes:
38198484
change-Id: I8e9435ddc4cf21fb648d39aace93f3af0e1fdf4f
Romain Guy [Fri, 9 Jun 2017 01:24:25 +0000 (18:24 -0700)]
Fix CTS : BitmapRGBAF16Test#testSetPixel failure
Don't grab a pointer to a temporary object on the stack!
Bug:
62458021
Test: CtsGraphicsTestCase
Change-Id: Ic9662e76c9064b3f3af6f8a4534d2ef56f9c5eea
Adrian Roos [Fri, 9 Jun 2017 00:38:36 +0000 (00:38 +0000)]
Merge "AOD: Move clock to prevent burn in" into oc-dr1-dev
Svetoslav Ganov [Fri, 9 Jun 2017 00:15:29 +0000 (17:15 -0700)]
Protect autofill UI against redressing
Test: LoginActivityTest#testAutoFillOneDatasetAndSaveHidingOverlays
bug:
62357517
Change-Id: Idcac67e1013178ba6c0d83994d49f8b485b2d334
Jorim Jaggi [Thu, 8 Jun 2017 22:40:38 +0000 (15:40 -0700)]
Properly run window animations at vsync-sf (1/2)
- Add new Choreographer instance that runs on vsync-sf
- Use this new Choreographer for WindowAnimator, and remove all
the hacks around it
Test: Open apps and close apps, notice no stutter
Test: Screen zoom animations
Test: go/wm-smoke
Bug:
36631902
Change-Id: I988ae25645effc3ac20efa7cb9b68f23444da0d0
Siyamed Sinir [Wed, 7 Jun 2017 23:26:19 +0000 (16:26 -0700)]
Force Autofill in FloatingToolbar overflow menu
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
bit CtsWidgetTestCases:android.widget.cts.EditTextTest
Bug:
62271937
Change-Id: Ib3447281f3bd1abc811a25fc55ad55e34e155bbb
Jakub Pawlowski [Fri, 9 Jun 2017 00:03:31 +0000 (00:03 +0000)]
Merge "Bluetooth: fix connectGatt overload invocations" into oc-dev
am:
556b10a4e6
Change-Id: I9477ac6e3990a4e2db4a8254f11702b1557591f3
Wale Ogunwale [Thu, 8 Jun 2017 23:51:48 +0000 (16:51 -0700)]
Fix deadlock when create alert window notification
Don't hold WM lock when calling into notification manager which
can call into activity manager.
Test: Make sure alert window notification is displayed
Change-Id: Id8831878093f8079f815a830ff8acdfad99d48cb
Fixes:
62458061
Jakub Pawlowski [Thu, 8 Jun 2017 23:51:21 +0000 (23:51 +0000)]
Merge "Bluetooth: fix connectGatt overload invocations" into oc-dev
Bookatz [Thu, 8 Jun 2017 21:50:46 +0000 (14:50 -0700)]
Batterystats logs smeared power model values
Fixes:
62302932
Test: cts-tradefed run cts-dev -m CtsDumpsysHostTestCases -t android.dumpsys.cts.BatteryStatsDumpsysTest
Change-Id: I8942aa9bc557fada4cf0be76aee6bd0bcee9ebb6
Matthew Ng [Thu, 8 Jun 2017 23:25:36 +0000 (23:25 +0000)]
Merge "Fixes the animation and state when docking a task by drag" into oc-dev
am:
008e620153
Change-Id: Id626a44a564ae0811338bb04c3c6efb698d07b37
Jason Monk [Thu, 8 Jun 2017 20:24:08 +0000 (16:24 -0400)]
Add notification listener plugin hook
Allows plugin control over notifications right at the entrance
to sysui and gives them the opportunity to mess with them how
they see fit.
Test: manual
Change-Id: I569bf37138da66d0524acecfa36ceb409f98fbb4
TreeHugger Robot [Thu, 8 Jun 2017 23:21:05 +0000 (23:21 +0000)]
Merge "Fixes the animation and state when docking a task by drag" into oc-dev
Bill Yi [Thu, 8 Jun 2017 23:15:04 +0000 (23:15 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
dd5886bc5b -s ours
Change-Id: I62a7f882d68c02075e41e2c9da475a75af113b0f
Bill Yi [Thu, 8 Jun 2017 23:12:30 +0000 (23:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
67a947b636 -s ours
Change-Id: If19e88be06d1d63955c7213c95dff59056a86c88
Bill Yi [Thu, 8 Jun 2017 23:04:51 +0000 (23:04 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Thu, 8 Jun 2017 23:03:52 +0000 (23:03 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Jorim Jaggi [Wed, 7 Jun 2017 21:33:04 +0000 (14:33 -0700)]
Boost android.anim and wm lock sections to -10 during transition
-4 is not enough if we have to compete against RT and main thread
from top app that have -10. Boost it more during app transitions
Test: Inspect systrace, make sure priorities are right, including
getting reset after the transition.
Test: Open Chrome 100x
Test: go/wm-smoke
Change-Id: Id6b060b8aafded67b4bae61b6e8960e37976b096
Fixes:
36631902
Bill Yi [Thu, 8 Jun 2017 22:41:45 +0000 (22:41 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
75b5199e9d -s ours
Change-Id: Ic7b1e9095cf413bd0401bd8d3cdfc469dd915988
Bill Yi [Thu, 8 Jun 2017 22:34:26 +0000 (22:34 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
jackqdyulei [Mon, 5 Jun 2017 23:15:54 +0000 (16:15 -0700)]
Copy smearing method to BatteryStatsHelper
This cl adds the following data in BatterySipper
1. screenPowerMah: power smeared by screen
2. proportionalSmearMah: power need to smeared proportionally
3. displayPowerMah: smeared power usage
This cl also copies bunch of methods from BatteryUtils to
BatteryStatsHelper with minor changes, so we could log smearing
logic in BatteryStatsHelper
Bug:
62300864
Test: runtest -x BatteryStatsHelperTest
Change-Id: I9f92f5c1ac5fa483d0c15a3d5daad570da68a7ff
Merged-In: I9f92f5c1ac5fa483d0c15a3d5daad570da68a7ff
Adam Lesinski [Thu, 8 Jun 2017 21:20:03 +0000 (21:20 +0000)]
Merge "Revert "always adjust per-user application info"" into oc-dev
am:
887544e100
Change-Id: I440be882264d8687d7b5e3de036e54bf91386d6d
George Mount [Thu, 8 Jun 2017 21:18:31 +0000 (14:18 -0700)]
Add target sdk check for behavior change.
Bug
62188967
A previous change stopped animations on fragment Views before
being removed. This change in behavior caused other problems,
so the behavior must be placed behind a target SDK check.
Test: ran fragment tests, validated on app
Change-Id: I098e9b0f1472d9838abeacba3baaa7581f7a82ad
Adam Lesinski [Thu, 8 Jun 2017 21:14:02 +0000 (21:14 +0000)]
Merge "Revert "always adjust per-user application info"" into oc-dev
Adam Lesinski [Thu, 8 Jun 2017 20:16:39 +0000 (20:16 +0000)]
Revert "always adjust per-user application info"
This reverts commit
e0046cecb079ec4d063444cee64795a6b734e6e7.
Reason for revert: Regresses UI theme
Bug:
62445682
Bug:
36561125
Change-Id: I9b60bd8e4eb89129368d38e83c0036ab459a524e
Jakub Pawlowski [Wed, 7 Jun 2017 20:45:33 +0000 (13:45 -0700)]
Bluetooth: fix connectGatt overload invocations
Merged-In: I726252e85e78bff2c9585332d2748a0d92a9f6d3
Test: sl4a GattOverBrEdrTest
Bug:
62387078
Change-Id: I5bfb87683e25f8862587e8000eb4c9bb6ff14f99
Winson Chung [Thu, 8 Jun 2017 20:46:12 +0000 (13:46 -0700)]
Removing legacy default thumbnail logic.
- With the move to snapshots, we no longer keep a local cache of the
thumbnails and tasks which have no thumbnails will be handled
in the snapshot from the system (if it uses FLAG_SECURE) or in
Recents directly through the task description background color.
In the case of this bug, the default thumbnail (1x1 white bitmap) was
incorrectly being applied because the system could not take a snapshot
of the app due to DRM.
Bug:
62447895
Test: Open any app with DRM, play video, tap Recents
Change-Id: I02e87cf513eb9750b39d54d085b0c19645b7ed52
Selim Cinek [Thu, 8 Jun 2017 20:20:08 +0000 (13:20 -0700)]
Fixed a bug where systemui could crash while cloning
Because cloning wasn't synchronized, the notification
could become a non-root temporarily which in turn could
lead to a crash.
1. We're now properly synchronizing the cloning, such that
this can't happen anymore
2. We're now only cloning the old statusbar notification lightly
instead of heavily to avoid this altogether
Test: manual, update decoratedcustomview notifications really fast
Change-Id: Ia6525eec64ad9a26956ca2198e20198f55b2173c
Fixes:
62181033
Tyler Gunn [Thu, 8 Jun 2017 20:26:55 +0000 (20:26 +0000)]
Merge "Add carrier config for allowing USSD requests via telephony manger APIs." into oc-dev
am:
980582e555
Change-Id: Id41b469e278c194337da36a0b34d02efa99b8906
Daichi Hirono [Thu, 8 Jun 2017 20:19:56 +0000 (20:19 +0000)]
Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev
am:
ebb6e998d5
Change-Id: I03e1b4ddb5315a2eae099bb85b692bf90744ba3d