OSDN Git Service
TreeHugger Robot [Thu, 28 Sep 2017 16:02:01 +0000 (16:02 +0000)]
Merge "Import translations. DO NOT MERGE"
David Pursell [Thu, 28 Sep 2017 16:01:06 +0000 (16:01 +0000)]
Merge "iot bootaction: use libandroidthings types."
TreeHugger Robot [Thu, 28 Sep 2017 15:56:19 +0000 (15:56 +0000)]
Merge "WebView: use proper javadocs"
TreeHugger Robot [Thu, 28 Sep 2017 15:41:27 +0000 (15:41 +0000)]
Merge "Import translations. DO NOT MERGE"
Andreas Gampe [Thu, 28 Sep 2017 15:33:25 +0000 (15:33 +0000)]
Merge "Frameworks: Move Log holder to be preloaded" into oc-mr1-dev am:
1a17bfa25c
am:
fd31b789f9
Change-Id: Ie6e2671e6ecd53e24cf8a2438ce032ecb0af012b
Andreas Gampe [Thu, 28 Sep 2017 15:25:50 +0000 (15:25 +0000)]
Merge "Frameworks: Move Log holder to be preloaded" into oc-mr1-dev
am:
1a17bfa25c
Change-Id: I108472693a5ce73cec529b354e65b1eeed6ee151
TreeHugger Robot [Thu, 28 Sep 2017 15:16:35 +0000 (15:16 +0000)]
Merge "Frameworks: Move Log holder to be preloaded" into oc-mr1-dev
TreeHugger Robot [Thu, 28 Sep 2017 15:15:56 +0000 (15:15 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 28 Sep 2017 14:52:05 +0000 (14:52 +0000)]
Merge "Import translations. DO NOT MERGE"
Hugo Benichi [Thu, 28 Sep 2017 12:40:44 +0000 (12:40 +0000)]
Merge "Fix NPE in NsdServiceTest" am:
60d5390f7a am:
f9422cc65b am:
a5d620ae92
am:
a838fcfa75
Change-Id: I5a4837078a7506b30497bba1cceb416ab37e82d9
Hugo Benichi [Thu, 28 Sep 2017 12:35:03 +0000 (12:35 +0000)]
Merge "Fix NPE in NsdServiceTest" am:
60d5390f7a am:
f9422cc65b
am:
a5d620ae92
Change-Id: Ieb299771438fe55566b76271815e52d02da799c8
Hugo Benichi [Thu, 28 Sep 2017 12:28:44 +0000 (12:28 +0000)]
Merge "Fix NPE in NsdServiceTest" am:
60d5390f7a
am:
f9422cc65b
Change-Id: I2c88d81081c7994d42eb2715f29233817730201d
Hugo Benichi [Thu, 28 Sep 2017 12:22:34 +0000 (12:22 +0000)]
Merge "Fix NPE in NsdServiceTest"
am:
60d5390f7a
Change-Id: Ic9b7aaec14066d18247cc1efbdc06be1e6a79f29
Hugo Benichi [Thu, 28 Sep 2017 12:13:18 +0000 (12:13 +0000)]
Merge "Fix NPE in NsdServiceTest"
Bill Yi [Thu, 28 Sep 2017 10:30:14 +0000 (03:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0e6bc9da1dccf653532ebbd40259cc2688465961
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Thu, 28 Sep 2017 09:13:42 +0000 (02:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: I08b3fd9fafe7068316955313026f410aae3faa65
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Thu, 28 Sep 2017 08:42:54 +0000 (01:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibb24a0fa090668b2e461d0c86b794aeccf34d3cf
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Jean Chalard [Thu, 28 Sep 2017 08:04:58 +0000 (08:04 +0000)]
Merge "Do not throw on call to isTetheringSupported w/o permission" am:
6201cc6f27 am:
758d1e1ef7 am:
f4c8a84039
am:
d74766c251
Change-Id: I45cbf4d5cdcbc59d1a3000223e592be231d586a7
Jean Chalard [Thu, 28 Sep 2017 07:58:59 +0000 (07:58 +0000)]
Merge "Do not throw on call to isTetheringSupported w/o permission" am:
6201cc6f27 am:
758d1e1ef7
am:
f4c8a84039
Change-Id: I076cb752b5d48a2a16abec72a47fe61690e90227
Jean Chalard [Thu, 28 Sep 2017 07:52:54 +0000 (07:52 +0000)]
Merge "Do not throw on call to isTetheringSupported w/o permission" am:
6201cc6f27
am:
758d1e1ef7
Change-Id: Ic620c2d3be6c7c5dd815961a36e5296a761e7d73
Jean Chalard [Thu, 28 Sep 2017 07:47:30 +0000 (07:47 +0000)]
Merge "Do not throw on call to isTetheringSupported w/o permission"
am:
6201cc6f27
Change-Id: Ie2ed67525e719104cef1537568f944b77d5f5e4e
Jean Chalard [Thu, 28 Sep 2017 07:39:14 +0000 (07:39 +0000)]
Merge "Do not throw on call to isTetheringSupported w/o permission"
Chalard Jean [Tue, 26 Sep 2017 06:45:18 +0000 (15:45 +0900)]
Do not throw on call to isTetheringSupported w/o permission
...just return false instead.
Test: Made an app to test this. Made sure it doesn't have
Test: the required permission. Checked it crashes with
Test: SecurityException without this change. Checked that it
Test: doesn't with it.
Merged-In: Ib5b17a7f68c1327f47fe1f54c0454c51f4226907
Change-Id: Id20d3c240ec5d70d085e0366b92ab3a514f3e7c8
(cherry picked from commit
8f76fc38ec1682667de2caf3940fbfb71744d368)
Hugo Benichi [Tue, 26 Sep 2017 05:51:11 +0000 (14:51 +0900)]
Fix NPE in NsdServiceTest
Continuous test dashboards report that quit() can crash sometimes
due to mThread being null.
This patch adds a null guard in tearDown().
Bug:
32561414
Test: runtest frameworks-net
Change-Id: If66fb47e31e77d25b4741a786f12eb78f0b9102e
Doris Liu [Thu, 28 Sep 2017 04:57:55 +0000 (04:57 +0000)]
Merge "Associate RenderNodes created for hw bitmap w/ views" into oc-mr1-dev am:
a3acf73c3e
am:
732b3c4159
Change-Id: Icbc3a7878d001ec62c15e9ef116bb1dc084c87ac
Matthew Ng [Thu, 28 Sep 2017 04:53:29 +0000 (04:53 +0000)]
Merge "Handle clear all button show and hide functionality for low ram devices" into oc-mr1-dev am:
88c6071b5d
am:
69a8665153
Change-Id: I825bc0ec819321cad44eda3d0efa7f5cc2e58d05
Beverly [Thu, 28 Sep 2017 04:47:58 +0000 (04:47 +0000)]
Merge "In-call-notif doesn't use AUDIBILITY_ENFORCED flag" into oc-mr1-dev am:
1986261870
am:
20464662b8
Change-Id: Ie1331a3e712bfed768419a563bb3ccec4cf557fb
Zhi An Ng [Thu, 28 Sep 2017 04:41:46 +0000 (04:41 +0000)]
Merge "Show dialog if top app is killed by lmk" into oc-mr1-dev am:
7608d966c1
am:
0397bc7008 -s ours
Change-Id: I92da934b49fb9981c413eff768bc00a8bbed5c18
TreeHugger Robot [Thu, 28 Sep 2017 04:32:43 +0000 (04:32 +0000)]
Merge "Enable fingerprint cleanup upon connection to daemon and upon user switches"
TreeHugger Robot [Thu, 28 Sep 2017 04:08:50 +0000 (04:08 +0000)]
Merge "Keep locale info in Hyphenator."
TreeHugger Robot [Thu, 28 Sep 2017 04:05:34 +0000 (04:05 +0000)]
Merge "Per-user fingerprint lockout"
TreeHugger Robot [Thu, 28 Sep 2017 03:22:31 +0000 (03:22 +0000)]
Merge "[StatusBar] Remove unused code. General clean-up."
Doris Liu [Thu, 28 Sep 2017 02:48:26 +0000 (02:48 +0000)]
Merge "Associate RenderNodes created for hw bitmap w/ views" into oc-mr1-dev
am:
a3acf73c3e
Change-Id: I1aa48a41fbbf453f9a3d0ce794f81103a5ed1e35
Matthew Ng [Thu, 28 Sep 2017 02:38:19 +0000 (02:38 +0000)]
Merge "Handle clear all button show and hide functionality for low ram devices" into oc-mr1-dev
am:
88c6071b5d
Change-Id: Ie6e19de115ef8647a6d5b8d6b81efc3743778bc5
Doris Liu [Thu, 28 Sep 2017 02:33:48 +0000 (02:33 +0000)]
Merge "Associate RenderNodes created for hw bitmap w/ views" into oc-mr1-dev
TreeHugger Robot [Thu, 28 Sep 2017 02:27:04 +0000 (02:27 +0000)]
Merge "Handle clear all button show and hide functionality for low ram devices" into oc-mr1-dev
Kevin Chyn [Wed, 30 Aug 2017 22:28:28 +0000 (15:28 -0700)]
Per-user fingerprint lockout
Also changed from AlarmManager.set() to AlarmManager.setExact(), since
this should be infrequent and not impact power savings (alarm batching)
Fixes:
64485566
Test: manual test with multiple users, with added logs in
schedule/cancelLockoutResetForUser
Change-Id: I54a2058ddc081ab843bb37efe68913eca0a91916
Seigo Nonaka [Fri, 1 Sep 2017 01:22:38 +0000 (18:22 -0700)]
Keep locale info in Hyphenator.
Even if the same data file is used, different hyphenation is applied
based on the locale. Now Hyphenator keeps locale and use it for
hyphenation.
Bug:
65024629
Test: bit CtsTextTestCases:android.text.cts.StaticLayoutTest
Test: bit CtsTextTestCases:android.text.cts.DynamicLayoutTest
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Change-Id: I7e2ece979181d12ac1adbede14995ec9b7b87d21
Beverly [Thu, 28 Sep 2017 01:51:23 +0000 (01:51 +0000)]
Merge "In-call-notif doesn't use AUDIBILITY_ENFORCED flag" into oc-mr1-dev
am:
1986261870
Change-Id: I79e08d9cbfce62b6e4c668858e1bf366760cd969
TreeHugger Robot [Thu, 28 Sep 2017 01:43:59 +0000 (01:43 +0000)]
Merge "In-call-notif doesn't use AUDIBILITY_ENFORCED flag" into oc-mr1-dev
Bill Yi [Thu, 28 Sep 2017 01:40:20 +0000 (18:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id508bdbfcd755a0fc46b9aeb646ef6a9d66b5f13
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
TreeHugger Robot [Thu, 28 Sep 2017 01:07:01 +0000 (01:07 +0000)]
Merge "Take padding information into StaticLayout"
Zhi An Ng [Thu, 28 Sep 2017 01:01:29 +0000 (01:01 +0000)]
Merge "Show dialog if top app is killed by lmk" into oc-mr1-dev
am:
7608d966c1
Change-Id: I04e97f266599bd237944beb448a4cf87285634ad
TreeHugger Robot [Thu, 28 Sep 2017 00:58:55 +0000 (00:58 +0000)]
Merge "Enabling battery manager proto field for incidentd."
Zhi An Ng [Thu, 28 Sep 2017 00:52:52 +0000 (00:52 +0000)]
Merge "Show dialog if top app is killed by lmk" into oc-mr1-dev
Jeff Sharkey [Thu, 28 Sep 2017 00:47:23 +0000 (00:47 +0000)]
Merge "Merge "Only construct real Throwable objects." into oc-dev am:
0868533760 am:
f0278f30da am:
2c56bb54be" into oc-mr1-dev-plus-aosp
am:
9ac9862e16
Change-Id: Ibefa4648be58acd9d7302114c9f398ef42464d67
Jeff Sharkey [Thu, 28 Sep 2017 00:43:24 +0000 (00:43 +0000)]
Merge "Only construct real Throwable objects." into oc-dev am:
0868533760 am:
f0278f30da am:
08415b47b0
am:
187b437818
Change-Id: If7295c70aa688b388ba35efc4e170e843926ffb1
Android Build Merger (Role) [Thu, 28 Sep 2017 00:38:10 +0000 (00:38 +0000)]
Merge "Merge "Only construct real Throwable objects." into oc-dev am:
0868533760 am:
f0278f30da am:
2c56bb54be" into oc-mr1-dev-plus-aosp
Jeff Sharkey [Thu, 28 Sep 2017 00:35:32 +0000 (00:35 +0000)]
Merge "Only construct real Throwable objects." into oc-dev am:
0868533760 am:
f0278f30da
am:
2c56bb54be
Change-Id: I94f71a7bca16e93085058b96389bd34e72eab8c8
Jeff Sharkey [Thu, 28 Sep 2017 00:35:12 +0000 (00:35 +0000)]
Merge "Only construct real Throwable objects." into oc-dev am:
0868533760 am:
f0278f30da
am:
08415b47b0
Change-Id: I6fac18c8ba18f387b9b864055985b2a6bd12de68
Jeff Sharkey [Thu, 28 Sep 2017 00:23:50 +0000 (00:23 +0000)]
Merge "Only construct real Throwable objects." into oc-dev am:
0868533760
am:
f0278f30da
Change-Id: Id23ee02fb7cfd4b4ab9782066a085ee000fb8a70
Jeff Sharkey [Thu, 28 Sep 2017 00:23:46 +0000 (00:23 +0000)]
Merge "Only construct real Throwable objects." into oc-dev am:
0868533760
am:
f0278f30da
Change-Id: I3a7cbb7cad2c9663e4f7aa2e583ef5707cf6bbc2
Jeff Sharkey [Thu, 28 Sep 2017 00:15:18 +0000 (00:15 +0000)]
Merge "Only construct real Throwable objects." into oc-dev
am:
0868533760
Change-Id: I260dc1d1c903f1c1c2828d68049f9f202daa0869
Matthew Ng [Thu, 21 Sep 2017 18:10:32 +0000 (11:10 -0700)]
Handle clear all button show and hide functionality for low ram devices
Hides the clear all button at the beginning and shows it when scrolling
the list up or when swiping an app away. The clear all button will not
hide when already shown. Users can also start the scroll gesture over
the clear all button to scroll the list.
Test: manual - use low ram device and go to recents and scroll
Change-Id: Ie2d22db9bdd66308ce8ef3acf77b9f707d638ade
Fixes:
65571889
TreeHugger Robot [Thu, 28 Sep 2017 00:05:42 +0000 (00:05 +0000)]
Merge "Only construct real Throwable objects." into oc-dev
Doris Liu [Wed, 27 Sep 2017 22:47:39 +0000 (15:47 -0700)]
Associate RenderNodes created for hw bitmap w/ views
In transition animations, in order to capture the content of a view
or a drawable in a hw bitmap, a RenderNode needs to be created. The
RenderNode was previously setup with no owning view. As a result,
in cases where RenderNode animations are triggered by the draw calls
in displaylist recording, these animations would fail for lack of a
view to animate on.
This CL ensures that when RenderNodes are created for the purpose of
populating content in a hw bitmap in transitions, there's always a
view associated with each RenderNode.
BUG:
65160121
Test: Force to repro crash by changing press state during hw bitmap
creation, which triggers a ripple animation that led to the
otherwise timing dependent and hard to repro crash.
Change-Id: I2b4ba95cad25a94d50b3904e775606f737e960e3
David Pursell [Wed, 27 Sep 2017 21:15:21 +0000 (14:15 -0700)]
iot bootaction: use libandroidthings types.
We now provide some parameters that can be set on reboot and passed into
the bootaction library. This becomes part of the public libandroidthings
native API, so we need to use the public type.
Bug:
65462981
Test: `mma` builds successfully
Test: Test bootaction.so can receive boot params (tested on nyc-iot-dev)
Change-Id: Ibf6548730e0bac023f6a0a3aef925b0938418a10
Mathieu Chartier [Wed, 27 Sep 2017 23:00:49 +0000 (23:00 +0000)]
Merge "Revert "Revert "Add preopt profile logic for compiling during first boot""" into oc-mr1-dev am:
00579bd49a
am:
7fe00cc2e7
Change-Id: I99f84825f0a3bcbc584fffff84ba67cdc24ba9d5
Mathieu Chartier [Wed, 27 Sep 2017 22:53:11 +0000 (22:53 +0000)]
Merge "Revert "Revert "Add preopt profile logic for compiling during first boot""" into oc-mr1-dev
am:
00579bd49a
Change-Id: I5ddd1386683cab62754147cdbbdf6196c45ac271
Roozbeh Pournader [Tue, 29 Aug 2017 21:14:28 +0000 (14:14 -0700)]
Take padding information into StaticLayout
This is useful for figuring out if we should adjust width of text
in case the overhangs are more than available padding.
Bug:
63938206
Test: pending
Change-Id: I04592a7cbce264fe133e17e4df0daee626a99d85
Mathieu Chartier [Wed, 27 Sep 2017 22:46:24 +0000 (22:46 +0000)]
Merge "Revert "Revert "Add preopt profile logic for compiling during first boot""" into oc-mr1-dev
Andreas Gampe [Wed, 27 Sep 2017 18:57:27 +0000 (11:57 -0700)]
Frameworks: Move Log holder to be preloaded
To avoid issues with late initialization, let the holder be
initialized in the zygote.
Bug:
65927416
Test: m
Change-Id: I6f454df46d4c64d295e1f2510793d5087b74fb74
TreeHugger Robot [Wed, 27 Sep 2017 22:30:09 +0000 (22:30 +0000)]
Merge "Adds new utility functions for evaluating log entry matching. Includes matching for both simple and compound matchers."
TreeHugger Robot [Wed, 27 Sep 2017 22:16:33 +0000 (22:16 +0000)]
Merge "Add "ssid" command to demo mode for easy testing of AP names"
Ng Zhi An [Wed, 13 Sep 2017 22:09:32 +0000 (15:09 -0700)]
Show dialog if top app is killed by lmk
Bug:
65488249
Fixes:
65488249
Test: run an app, then kill from command line like so
adb shell "kill \$(pidof app)"
Change-Id: I7c259542723a9659c52e4571071ec5809693816d
Merged-In: I7c259542723a9659c52e4571071ec5809693816d
Zhi An Ng [Wed, 27 Sep 2017 21:56:35 +0000 (21:56 +0000)]
Merge "Show dialog if top app is killed by lmk"
TreeHugger Robot [Wed, 27 Sep 2017 21:14:06 +0000 (21:14 +0000)]
Merge "Apply texture matrix to the layer canvas"
Doris Liu [Wed, 27 Sep 2017 20:42:12 +0000 (20:42 +0000)]
Merge "Fix end() for infinite AnimatorSet" into oc-mr1-dev am:
aace655509
am:
198cde9450
Change-Id: I61d75f633885911a2a5db3cd628960803c31dcc0
Doris Liu [Wed, 27 Sep 2017 20:30:45 +0000 (20:30 +0000)]
Merge "Fix end() for infinite AnimatorSet" into oc-mr1-dev
am:
aace655509
Change-Id: Ie7c8890bf9aea1db9f6616ef1ed40955335581e2
Pulkit Bhuwalka [Wed, 27 Sep 2017 20:25:33 +0000 (20:25 +0000)]
Merge "Modify Bluetooth Class of Device from Android stack" am:
f4ec2ab706 am:
c037004fd9 am:
69da7a1766
am:
252eebec97
Change-Id: I24594136dcf5e813f0e29de896fbb5d3abd7b777
Doris Liu [Wed, 27 Sep 2017 20:23:12 +0000 (20:23 +0000)]
Merge "Fix end() for infinite AnimatorSet" into oc-mr1-dev
Pulkit Bhuwalka [Wed, 27 Sep 2017 20:18:38 +0000 (20:18 +0000)]
Merge "Modify Bluetooth Class of Device from Android stack" am:
f4ec2ab706 am:
c037004fd9
am:
69da7a1766
Change-Id: I5815862db057bf1925bfa9482a451aa0ac3b08ad
TreeHugger Robot [Wed, 27 Sep 2017 20:18:20 +0000 (20:18 +0000)]
Merge "Remove nSetLocales"
Pulkit Bhuwalka [Wed, 27 Sep 2017 20:12:09 +0000 (20:12 +0000)]
Merge "Modify Bluetooth Class of Device from Android stack" am:
f4ec2ab706
am:
c037004fd9
Change-Id: I06831c086920b93f0c1c076e255ce404769b8691
Pulkit Bhuwalka [Wed, 27 Sep 2017 20:04:32 +0000 (20:04 +0000)]
Merge "Modify Bluetooth Class of Device from Android stack"
am:
f4ec2ab706
Change-Id: I9a0b06f44d2fe7be343fc38ce240d82f1b309d7d
John Reck [Wed, 27 Sep 2017 19:56:58 +0000 (19:56 +0000)]
Merge "Add nullptr check" into oc-mr1-dev am:
b20694ab00
am:
5fa85b7e2e
Change-Id: Ieb93edf167a158a1f1759c6ffc6f492eac0b4144
John Reck [Wed, 27 Sep 2017 19:50:07 +0000 (19:50 +0000)]
Merge "Add nullptr check" into oc-mr1-dev
am:
b20694ab00
Change-Id: I090a1d0a4f0b2b5ec8c599d795995ea242c2a6ca
Winson Chung [Wed, 27 Sep 2017 19:50:07 +0000 (19:50 +0000)]
Merge "Minimal change to ensure that position is last saved when docking." into oc-mr1-dev am:
1ca7d06313
am:
4726b4e8dc
Change-Id: I3264b0a59ab9ff1b4b1d9ac0e66236e83c1bacd6
John Reck [Wed, 27 Sep 2017 19:43:29 +0000 (19:43 +0000)]
Merge "Add nullptr check" into oc-mr1-dev
Treehugger Robot [Wed, 27 Sep 2017 19:43:17 +0000 (19:43 +0000)]
Merge "Modify Bluetooth Class of Device from Android stack"
Winson Chung [Wed, 27 Sep 2017 19:41:39 +0000 (19:41 +0000)]
Merge "Minimal change to ensure that position is last saved when docking." into oc-mr1-dev
am:
1ca7d06313
Change-Id: Ifd9843a433cadc7d0effa6783455e933ca5d2575
Winson Chung [Wed, 27 Sep 2017 19:34:45 +0000 (19:34 +0000)]
Merge "Minimal change to ensure that position is last saved when docking." into oc-mr1-dev
TreeHugger Robot [Wed, 27 Sep 2017 19:18:18 +0000 (19:18 +0000)]
Merge "Simplifying writeToParcel for various actions"
Kweku Adams [Wed, 27 Sep 2017 19:01:02 +0000 (12:01 -0700)]
Enabling battery manager proto field for incidentd.
BUG:
65750806
Test: flash device and check incident proto output
Change-Id: I9ea14a4e8945f1885c68a64213477a1ed70968ad
Stan Iliev [Wed, 27 Sep 2017 15:05:29 +0000 (11:05 -0400)]
Apply texture matrix to the layer canvas
Fix camera preview shown inverted. Apply texture matrix when
drawing opengl layer.
Test: Ran camera preview in message app and smart lock with face.
Ran CtsUiRenderingTestCases and CtsGraphicsTestCases tests.
Bug:
65534412
Change-Id: I3ed52a6c62921fcdfe30104dd176802ed1533fad
TreeHugger Robot [Wed, 27 Sep 2017 18:37:39 +0000 (18:37 +0000)]
Merge "AAPT2: Convert binary ResTable_config to proto"
Tony Mantler [Wed, 27 Sep 2017 18:22:10 +0000 (18:22 +0000)]
Merge "Make ApplicationsState.Session lifecycle-aware"
Evan Laird [Wed, 27 Sep 2017 18:09:30 +0000 (14:09 -0400)]
Add "ssid" command to demo mode for easy testing of AP names
Test: turn on SystemUI demo mode;
adb shell am broadcast -a "com.android.systemui.demo" -e command
network -e wifi show -e ssid DemoWifiName
Bug: (inspired by)
65765440
Change-Id: Ibd13478e44d013ca43e604812fece15f78390932
Fyodor Kupolov [Wed, 27 Sep 2017 17:39:17 +0000 (17:39 +0000)]
Merge "Use separate lock in UserController"
David Chen [Tue, 26 Sep 2017 18:44:40 +0000 (11:44 -0700)]
Adds new utility functions for evaluating log entry matching.
Includes matching for both simple and compound matchers.
Change-Id: Id913d2625d205ad9a529019e98ae805f730f4d48
Test: Added new unit-tests and checked on marlin device.
Jeffrey Huang [Wed, 27 Sep 2017 17:03:15 +0000 (17:03 +0000)]
Merge "Add new methods to PkgMgrWrapper for testing"
Winson Chung [Tue, 26 Sep 2017 18:51:08 +0000 (11:51 -0700)]
Minimal change to ensure that position is last saved when docking.
- When a task is docked from Recents, the last position is never updated
if the user never touches the divider. Ensure that the default dock
snap target is saved in this case as well.
Bug:
66903645
Test: Dock a task from Recents, go home, and hit recents
Change-Id: Ia229d2ba0eee792424fb9e9c043320cec71695dc
Siyamed Sinir [Wed, 27 Sep 2017 16:52:51 +0000 (16:52 +0000)]
Merge "Refactor imports for text performance tests"
John Reck [Wed, 27 Sep 2017 16:30:30 +0000 (09:30 -0700)]
Add nullptr check
Bug:
65717856
Test: builds
Change-Id: I188d3366e956f087c6317ae0b56d5fb19a20708d
Sunny Goyal [Fri, 22 Sep 2017 04:00:36 +0000 (21:00 -0700)]
Simplifying writeToParcel for various actions
> Using helper methods when writing and reading typed objects
> Moving the tag write outside the action, as it is read outside
the action as well
> Removing usused tags
Test: am instrument -w -e class android.widget.RemoteViewsTest com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Bug:
65574108
Change-Id: Iaf51cae6ef9f82b70dc1f19c2f019af40c4424a2
Beverly [Wed, 27 Sep 2017 13:58:59 +0000 (09:58 -0400)]
In-call-notif doesn't use AUDIBILITY_ENFORCED flag
Audibilty enforced flag should only be used to make sure system
sounds are audible when this is mandated by a given country regulation.
Here, it was used incorrectly. Also, adjusted in-call notification
sound to be less loud.
Fixes:
66808711
Test: manual
Change-Id: I119a718fb5fc605b6f6b3e387e5e9f956cfd5fff
TreeHugger Robot [Wed, 27 Sep 2017 14:39:06 +0000 (14:39 +0000)]
Merge "use new SkFontMgr API"
Abodunrinwa Toki [Wed, 27 Sep 2017 14:25:28 +0000 (14:25 +0000)]
Fix crash due to TextView.getText() returning null. am:
8f22de0e7f
am:
e6a5d22b42 -s ours
Change-Id: I95498146d6e7b4df48d5feb41e8c69150993d0dc
Abodunrinwa Toki [Wed, 27 Sep 2017 14:17:57 +0000 (14:17 +0000)]
Fix crash due to TextView.getText() returning null.
am:
8f22de0e7f
Change-Id: I0166041823ff6467762df45efd66bfa7d0be5bff
TreeHugger Robot [Wed, 27 Sep 2017 11:54:12 +0000 (11:54 +0000)]
Merge "Fix crash due to TextView.getText() returning null."