OSDN Git Service
Felipe Leme [Wed, 7 Jun 2017 00:55:27 +0000 (00:55 +0000)]
Merge "Fixed autofill filter comparison." into oc-dev
am:
72f2d98c5a
Change-Id: I1fef87940fe08d875d3d449a830bd652871e2505
Felipe Leme [Wed, 7 Jun 2017 00:51:31 +0000 (00:51 +0000)]
Merge "Improved debug to diagnose Save issues." into oc-dev
am:
be4420cf13
Change-Id: Id65b8d62403af8883503d5b31903d73751f33bf2
Felipe Leme [Wed, 7 Jun 2017 00:46:53 +0000 (00:46 +0000)]
Merge "Use initial value on save when value didn't change." into oc-dev
am:
2e723982d5
Change-Id: Ie8196727744de7b8a5d51fe671bca8c984ae321d
Felipe Leme [Wed, 7 Jun 2017 00:38:40 +0000 (00:38 +0000)]
Merge "Don't show AUTOFILL menu when text is selected." into oc-dev
am:
49231f183f
Change-Id: I5d182201cc568caa894dddd6352cbf6abb83a03b
Marco Nelissen [Wed, 7 Jun 2017 00:31:38 +0000 (00:31 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546 am:
6d5bc9a3c2 am:
3272cf26c1 am:
e18e8c4113 am:
69b6a382a3 am:
ce5c72e887 am:
4d9e6150f3 am:
d7fe3ea6a8 am:
db9d2588b8 am:
9e4e6c4b7c
am:
6596f721fd
Change-Id: Iaf21b4182d659b4ffc5b2e514c7a4dfcb15cc143
Felipe Leme [Wed, 7 Jun 2017 00:30:48 +0000 (00:30 +0000)]
Merge "Fixed autofill filter comparison." into oc-dev
Felipe Leme [Wed, 7 Jun 2017 00:26:05 +0000 (00:26 +0000)]
Merge "Improved debug to diagnose Save issues." into oc-dev
Felipe Leme [Wed, 7 Jun 2017 00:25:01 +0000 (00:25 +0000)]
Merge "Use initial value on save when value didn't change." into oc-dev
Marco Nelissen [Wed, 7 Jun 2017 00:24:23 +0000 (00:24 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546 am:
6d5bc9a3c2 am:
3272cf26c1 am:
e18e8c4113 am:
69b6a382a3 am:
ce5c72e887 am:
4d9e6150f3 am:
d7fe3ea6a8 am:
db9d2588b8 am:
9e4e6c4b7c
am:
2c1d4f8f7b
Change-Id: I90250994c72bd9cc54ebb87df3f0f7f510417ef1
Felipe Leme [Wed, 7 Jun 2017 00:23:59 +0000 (00:23 +0000)]
Merge "Don't show AUTOFILL menu when text is selected." into oc-dev
Marco Nelissen [Wed, 7 Jun 2017 00:20:21 +0000 (00:20 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546 am:
6d5bc9a3c2 am:
3272cf26c1 am:
e18e8c4113 am:
69b6a382a3 am:
ce5c72e887 am:
4d9e6150f3 am:
d7fe3ea6a8 am:
db9d2588b8
am:
9e4e6c4b7c
Change-Id: I96b9977d0bd218e3c13dcd177b8033657a023d14
Marco Nelissen [Wed, 7 Jun 2017 00:16:34 +0000 (00:16 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546 am:
6d5bc9a3c2 am:
3272cf26c1 am:
e18e8c4113 am:
69b6a382a3 am:
ce5c72e887 am:
4d9e6150f3 am:
d7fe3ea6a8 am:
db9d2588b8
am:
9e4e6c4b7c
Change-Id: I1d028759fecc34081daf0be653a1b729e0e048ac
Marco Nelissen [Wed, 7 Jun 2017 00:10:27 +0000 (00:10 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546 am:
6d5bc9a3c2 am:
3272cf26c1 am:
e18e8c4113 am:
69b6a382a3 am:
ce5c72e887 am:
4d9e6150f3 am:
d7fe3ea6a8
am:
db9d2588b8
Change-Id: I8da5c1b0f6fb3d7676c463c354167abce71f8124
Marco Nelissen [Wed, 7 Jun 2017 00:04:12 +0000 (00:04 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546 am:
6d5bc9a3c2 am:
3272cf26c1 am:
e18e8c4113 am:
69b6a382a3 am:
ce5c72e887 am:
4d9e6150f3
am:
d7fe3ea6a8
Change-Id: Ic5a7104241d36e82418ce5a2a43595d2fa4bff47
Marco Nelissen [Tue, 6 Jun 2017 23:54:55 +0000 (23:54 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546 am:
6d5bc9a3c2 am:
3272cf26c1 am:
e18e8c4113 am:
69b6a382a3 am:
ce5c72e887
am:
4d9e6150f3
Change-Id: I5ede1388f265920fa5dd835c4a6335380daa9103
Rob Carr [Tue, 6 Jun 2017 23:52:56 +0000 (23:52 +0000)]
Merge "SurfaceView: Correct inverted alpha detection condition." into oc-dev
am:
3946916d56
Change-Id: Ia2d5ff30183d8588319dc4aa24f5512f3db75e55
Marco Nelissen [Tue, 6 Jun 2017 23:45:51 +0000 (23:45 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546 am:
6d5bc9a3c2 am:
3272cf26c1 am:
e18e8c4113 am:
69b6a382a3
am:
ce5c72e887
Change-Id: I081f15c5d6bb16b3f490e53dbc2910a45e6a920b
Felipe Leme [Tue, 6 Jun 2017 23:44:42 +0000 (23:44 +0000)]
Merge "Catch WindowManager exceptions so they don't crash the system." into oc-dev
am:
301fc823f3
Change-Id: Ib28ae2a7b3614fa73fa4e1b08e5607f7d6011891
Todd Kennedy [Tue, 6 Jun 2017 23:41:06 +0000 (23:41 +0000)]
Merge "Handle renamed packages during default grants" into oc-dev
am:
bfc083c3a0
Change-Id: I068bb7548d1c972c3824185e5ab933a7b48c387b
Marco Nelissen [Tue, 6 Jun 2017 23:39:57 +0000 (23:39 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546 am:
6d5bc9a3c2 am:
3272cf26c1 am:
e18e8c4113
am:
69b6a382a3
Change-Id: I2c599bac680bda5d4dcfa4f3b9fb5f1413839da0
Marco Nelissen [Tue, 6 Jun 2017 23:33:50 +0000 (23:33 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546 am:
6d5bc9a3c2 am:
3272cf26c1
am:
e18e8c4113
Change-Id: I5c34b680b1c7abcfd33c8719406516fe796afebb
Rob Carr [Tue, 6 Jun 2017 23:32:59 +0000 (23:32 +0000)]
Merge "SurfaceView: Correct inverted alpha detection condition." into oc-dev
Felipe Leme [Tue, 6 Jun 2017 23:30:57 +0000 (23:30 +0000)]
Merge "Catch WindowManager exceptions so they don't crash the system." into oc-dev
Todd Kennedy [Tue, 6 Jun 2017 23:29:05 +0000 (23:29 +0000)]
Merge "Handle renamed packages during default grants" into oc-dev
Marco Nelissen [Tue, 6 Jun 2017 23:28:27 +0000 (23:28 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546 am:
6d5bc9a3c2
am:
3272cf26c1
Change-Id: I92f069aa6f3a897f9bfba4405dcd64dc066db944
Marco Nelissen [Tue, 6 Jun 2017 23:22:14 +0000 (23:22 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546
am:
6d5bc9a3c2
Change-Id: I8165c2218d0d5de41468f8acff86a720c03d1f52
Marco Nelissen [Tue, 6 Jun 2017 23:16:24 +0000 (23:16 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64
am:
4b78a79546
Change-Id: Iceb4edfd80a0a483d28f2624669eff9dd86bfcb8
Marco Nelissen [Tue, 6 Jun 2017 23:10:16 +0000 (23:10 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb
am:
5181a7ab64
Change-Id: I34a176a0da235836eaa9e44b843ec5d5654b8db9
Selim Cinek [Tue, 6 Jun 2017 23:02:41 +0000 (23:02 +0000)]
Merge "Fixed an issue where would could be left with empty notifications" into oc-dev
am:
25e509462f
Change-Id: I69457f9a26085bc98e24b0c975106ddaa3199e98
Marco Nelissen [Tue, 6 Jun 2017 23:02:35 +0000 (23:02 +0000)]
Merge "Close connection before retrying" into lmp-dev
am:
a8648ecebb
Change-Id: I744fdb979aa2803b53d3ff6f4e3e72f6f1160d74
TreeHugger Robot [Tue, 6 Jun 2017 22:54:36 +0000 (22:54 +0000)]
Merge "Fixed an issue where would could be left with empty notifications" into oc-dev
TreeHugger Robot [Tue, 6 Jun 2017 22:53:55 +0000 (22:53 +0000)]
Merge "Close connection before retrying" into lmp-dev
Daniel Sandler [Tue, 6 Jun 2017 22:53:00 +0000 (22:53 +0000)]
Merge "resolve merge conflicts of
be23ef368f1a to oc-dev-plus-aosp" into oc-dev-plus-aosp
Keyvan Amiri [Tue, 6 Jun 2017 22:05:13 +0000 (22:05 +0000)]
Merge "Disabled task snapshot for TV" into oc-dev
am:
08b953dd2e
Change-Id: I220460741e82abbfaf3746763cbb4b09e9357965
TreeHugger Robot [Tue, 6 Jun 2017 21:56:16 +0000 (21:56 +0000)]
Merge "Disabled task snapshot for TV" into oc-dev
sunjian [Tue, 6 Jun 2017 21:56:07 +0000 (21:56 +0000)]
Update AccountManagerService side logic for .getAccountsByTypeForPackage with null type.
am:
d62dc39dc5
Change-Id: Idf3475786676e9713e4fa5756ecce9c675da8c3e
sunjian [Thu, 1 Jun 2017 19:05:59 +0000 (12:05 -0700)]
Update AccountManagerService side logic for .getAccountsByTypeForPackage
with null type.
Bug:
37987384
Test: manual, APCT
Change-Id: I4d5f735736f1b1d7bbf778aee2ec813071c34f19
Julius D'souza [Tue, 6 Jun 2017 21:36:50 +0000 (21:36 +0000)]
Merge "Add state machine model for skipping initial brightness ramps." into oc-dev
am:
9fd3076fe6
Change-Id: If95a7b60b75f06eb3c67de24b837c26ce259db92
Julius D'souza [Tue, 6 Jun 2017 21:29:39 +0000 (21:29 +0000)]
Merge "Add state machine model for skipping initial brightness ramps." into oc-dev
Aurimas Liutikas [Tue, 6 Jun 2017 21:29:29 +0000 (21:29 +0000)]
Merge "Remove usages of ActionBarActivity." into oc-dev
am:
c742b8ab2d
Change-Id: Ie10c1ddf16fa238b2e2ee5b0c58b1cff3981433f
TreeHugger Robot [Tue, 6 Jun 2017 21:20:39 +0000 (21:20 +0000)]
Merge "Remove usages of ActionBarActivity." into oc-dev
Robert Carr [Tue, 6 Jun 2017 21:04:50 +0000 (14:04 -0700)]
SurfaceView: Correct inverted alpha detection condition.
Careless mistake on my part :). Sorry about that.
Test: Try an app with two SV like Netflix verify top SurfaceView doesn't occlude bottom one.
Bug:
62375611
Bug:
62113351
Change-Id: Ia33aabf8b8e276f70365d62b82f113ecd3bee2fa
Todd Kennedy [Tue, 6 Jun 2017 20:44:09 +0000 (13:44 -0700)]
Handle renamed packages during default grants
If a device has a privileged app on the system image which was
updated and a future OTA renames the app package (supported only for
privileged apps) we end up with a disabled system package setting
with no package information. Since we are not doing a null check
of the package we get from the disabled package settings during
default grants we crash leaving the system in a bad state.
Test: Manual
Change-Id: Id7255c92a4a52e368266739cd331977256eee2d3
Fixes:
62376260
Felipe Leme [Tue, 6 Jun 2017 20:50:27 +0000 (13:50 -0700)]
Fixed autofill filter comparison.
Test: existing CtsAutoFillServiceTestCases pass
Test: filterTextDifferentPrefixes() pass
Fixes:
62377334
Change-Id: I9edaf500adad7e5775994a838410c3f8f6af2b1a
Felipe Leme [Mon, 5 Jun 2017 22:10:31 +0000 (15:10 -0700)]
Use initial value on save when value didn't change.
Otherwise, it will fail to call onSaveRequest() in scenarios where the service
required a field that was pre-populated for the app. For example, when the
service requires both a username and password, the app pre-populates the
username, and the user fills the password.
Test: new LoginActivityTest.testSaveOnlyTwoRequiredFieldsOnePrefilled() pass
Test: existing CtsAutoFillServiceTestCases pass
Bug:
62270740
Change-Id: Idbb11a8c2dab6741c18549c55dfdb71b483c2447
Jason Monk [Tue, 6 Jun 2017 20:38:00 +0000 (16:38 -0400)]
resolve merge conflicts of
be23ef368f1a to oc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I5364727a21f62fc479c9bca6ad7ab2c3b62d1d1b
Christopher Tate [Tue, 6 Jun 2017 20:32:55 +0000 (20:32 +0000)]
Merge "Fix #
62350081 - annotate permission requirements" into oc-dev
am:
42abe82bbb
Change-Id: I3b8415aac86f9dfd6457e5eca7dce904b1bfef7c
Jorim Jaggi [Tue, 6 Jun 2017 20:30:08 +0000 (20:30 +0000)]
Fix issue with dialer launch transition
am:
db93133782
Change-Id: Id1808ca8d1f2547ecb85679c4b7697ee37f69d9f
TreeHugger Robot [Tue, 6 Jun 2017 20:18:16 +0000 (20:18 +0000)]
Merge "Fix #
62350081 - annotate permission requirements" into oc-dev
Jorim Jaggi [Thu, 1 Jun 2017 23:07:34 +0000 (16:07 -0700)]
Fix issue with dialer launch transition
Test: Disable assistant, launch dialer on secure keyguard
Test: Launch assistant
Test: Launch camera
Change-Id: Ic3231f5f28fa0cf704b5f5d6e1993b296f14f5a3
Fixes:
38450585
Bryce Lee [Tue, 6 Jun 2017 19:52:35 +0000 (19:52 +0000)]
Merge "Associate freezing display with a target display id." into oc-dev
am:
1795242288
Change-Id: I41ae908e86152f42590fc346db382419c5b0a27b
Bryce Lee [Tue, 6 Jun 2017 19:42:40 +0000 (19:42 +0000)]
Merge "Associate freezing display with a target display id." into oc-dev
Keyvan Amiri [Tue, 6 Jun 2017 05:48:26 +0000 (22:48 -0700)]
Disabled task snapshot for TV
This was causing memory leaks when opening/closing Apps view. Will
disable this feature on TV since we are running low on RAM.
Bug:
62040693
Bug:
62359697
Test: go/wm-smoke
Change-Id: Ida290e8babc83a998a55efd10d602eb7f05f3102
Matthew Ng [Tue, 6 Jun 2017 19:24:43 +0000 (19:24 +0000)]
Merge "Add back recents staggering entrance animation" into oc-dev
am:
229119e06b
Change-Id: I4516daadd7ec9ceba523b3b6e1d58f6843c7600d
TreeHugger Robot [Tue, 6 Jun 2017 19:09:12 +0000 (19:09 +0000)]
Merge "Add back recents staggering entrance animation" into oc-dev
Gabriele M [Tue, 6 Jun 2017 19:00:21 +0000 (19:00 +0000)]
Merge "QS: Remove listeners only if added" am:
bede96729c
am:
a8e8f1c9f6
Change-Id: Id8211c9683230ee5cbf1bc7497f5e7d879116d56
Sundeep Ghuman [Tue, 6 Jun 2017 18:51:54 +0000 (18:51 +0000)]
Merge "Don't show unset score values for AccessPoints." into oc-dev
am:
32c65fccaf
Change-Id: I40586bcf4ab1fc32a15c145798460008ded764d1
Gabriele M [Tue, 6 Jun 2017 18:49:15 +0000 (18:49 +0000)]
Merge "QS: Remove listeners only if added"
am:
bede96729c
Change-Id: I53250273e39889b6b772dc12bbdbbc0c9606fd47
Jian Sun [Tue, 6 Jun 2017 18:48:33 +0000 (18:48 +0000)]
Merge "Fix visibility issue in AccountManager.getAuthTokenByFeatures." into oc-dev
am:
f1946baae7
Change-Id: Iacba4bd641367f5cf64bcd4d7098bba05fca835d
TreeHugger Robot [Tue, 6 Jun 2017 18:45:11 +0000 (18:45 +0000)]
Merge "Don't show unset score values for AccessPoints." into oc-dev
Treehugger Robot [Tue, 6 Jun 2017 18:36:25 +0000 (18:36 +0000)]
Merge "QS: Remove listeners only if added"
Jian Sun [Tue, 6 Jun 2017 18:29:58 +0000 (18:29 +0000)]
Merge "Fix visibility issue in AccountManager.getAuthTokenByFeatures." into oc-dev
Wale Ogunwale [Tue, 6 Jun 2017 17:53:46 +0000 (17:53 +0000)]
Merge "Don't allow removed DividerView to resize stack" into oc-dev
am:
d7427d5d90
Change-Id: I6dfe65d2d3e2c69be14b472dcd3e28389e70655f
TreeHugger Robot [Tue, 6 Jun 2017 17:46:31 +0000 (17:46 +0000)]
Merge "Don't allow removed DividerView to resize stack" into oc-dev
Sundeep Ghuman [Mon, 5 Jun 2017 23:10:38 +0000 (16:10 -0700)]
Don't show unset score values for AccessPoints.
Merged-In: I0fd96da6a06dafd8c8ebb435a2725ab155bd26ed
Bug: b/
3692675
Test: Visual confirmation
Change-Id: I52909bf55e6efabd2be6c17542f2a15135d25c62
Makoto Onuki [Tue, 6 Jun 2017 16:44:59 +0000 (16:44 +0000)]
Merge "Refer to ShortcutManagerCompat in the javadoc" into oc-dev
am:
a9c185f6e7
Change-Id: If571669aaa81d085774c1bb9a0daa308f237978a
Gabriele M [Mon, 5 Jun 2017 15:55:03 +0000 (17:55 +0200)]
QS: Remove listeners only if added
handleDestroy() calls setListening(false) unconditionally. This
causes an error if no listener was never added. Check if we added
a listener and then try to remove it.
Change-Id: Iefe8aacbe87ba1c2c19c9e77cf132fc7c84798f9
Makoto Onuki [Tue, 6 Jun 2017 16:26:05 +0000 (16:26 +0000)]
Merge "Refer to ShortcutManagerCompat in the javadoc" into oc-dev
Felipe Leme [Fri, 2 Jun 2017 22:20:31 +0000 (15:20 -0700)]
Improved debug to diagnose Save issues.
Test: manual verification
Bug:
62272098
Change-Id: Id7a6765fbe4228fcabb6cc0df37c5fde102d7077
Wale Ogunwale [Tue, 6 Jun 2017 15:31:17 +0000 (08:31 -0700)]
Don't allow removed DividerView to resize stack
If a divider view is removed or in the process of been removed, then it
should no longer have any influence on the size of stacks.
Fixes:
62273599
Test: go/wm-smoke
Test: enter split-screen and make sure recents is visible, lock and
unlock the device and verify things look fine.
Change-Id: I79aca82be8a7013328b78e82f508c4ed9fa48a4a
Jeff Sharkey [Tue, 6 Jun 2017 15:28:26 +0000 (15:28 +0000)]
Merge "Give Doclava our manifest; more permission docs." into oc-dev
am:
65d4cbba37
Change-Id: I2ec50efb67debd15d354db69b84fb620eb74bc0e
Jeff Sharkey [Tue, 6 Jun 2017 15:19:19 +0000 (15:19 +0000)]
Merge "Give Doclava our manifest; more permission docs." into oc-dev
Aurimas Liutikas [Thu, 18 May 2017 17:51:48 +0000 (10:51 -0700)]
Remove usages of ActionBarActivity.
ActionBarActivity has been deprecated for 2+ years and has been
extending AppCompatActivity for all that time. These changes
should be no-ops.
Bug:
35253513
Test: None
Change-Id: Ica46ccbc2b29a6a3399f7deed6045c1f7e1cd429
(cherry picked from commit
19bda3d9176b02198df4cec807d86e6797f8993e)
Bryce Lee [Tue, 6 Jun 2017 00:25:59 +0000 (17:25 -0700)]
Associate freezing display with a target display id.
Currently, start/stop freezing is always associated with the default
display. As a result, any animations that result from freezing will
occur on the default display. One situation this happens is during a
configuration change, where a screen rotation can be triggered. In
the case of adding a secondary display, a configuration change is
always triggered to apply the override configuration at the display
level. As a result, the default display exhibits a rotation animation
upon unfreezing during surface placement.
This changelist passes down the display id associated with the action
so that the animations may be applied to the right display. In the
scenario described perviously, the secondary display id is passed down
and therefore is the target of the rotation animation during
unfreezing.
Fixes:
35486733
Test: go/wm-smoke
Test: cts-tradefed run singleCommand cts-dev --module CtsViewTestCases --test android.view.cts.SurfaceViewSyncTest#testSmallRect
Change-Id: I87e56f5901934327fc50b3c7e543b5e36b8ff34f
Rebecca Silberstein [Tue, 6 Jun 2017 14:49:57 +0000 (14:49 +0000)]
Merge "WifiConfiguration: add local only networkId" into oc-dev
am:
46f4d5c4a6
Change-Id: I76454a05fdeec94b84d0bfb6f084790e0a7f77d5
Rebecca Silberstein [Tue, 6 Jun 2017 14:42:54 +0000 (14:42 +0000)]
Merge "WifiConfiguration: add local only networkId" into oc-dev
Bryce Lee [Tue, 6 Jun 2017 14:38:58 +0000 (14:38 +0000)]
Merge "Coordinate configuration changes and window frame size." into oc-dev
am:
749cbb1911
Change-Id: I2a27d8b34967603b0621332651a31be025542c09
Bryce Lee [Tue, 6 Jun 2017 14:26:28 +0000 (14:26 +0000)]
Merge "Coordinate configuration changes and window frame size." into oc-dev
Paul Duffin [Tue, 6 Jun 2017 08:13:12 +0000 (08:13 +0000)]
Merge "Added android.test.mock and android.test.mock.sdk targets" am:
46f8d427c4 am:
de30ee2d40
am:
e468747115
Change-Id: I50e3ae83eabe75cb87e0dd25acd05eee811c25ce
Paul Duffin [Tue, 6 Jun 2017 08:01:41 +0000 (08:01 +0000)]
Merge "Added android.test.mock and android.test.mock.sdk targets" am:
46f8d427c4
am:
de30ee2d40
Change-Id: I4f615991b43350df9748d7f05fdcf5501eff135d
Paul Duffin [Tue, 6 Jun 2017 07:49:39 +0000 (07:49 +0000)]
Merge "Added android.test.mock and android.test.mock.sdk targets"
am:
46f8d427c4
Change-Id: I93ecb5e95337b84c2746b802fa88382cdd676cb8
Paul Duffin [Tue, 6 Jun 2017 07:40:17 +0000 (07:40 +0000)]
Merge "Added android.test.mock and android.test.mock.sdk targets"
Erik Kline [Tue, 6 Jun 2017 05:16:27 +0000 (05:16 +0000)]
Merge "Support setting upstream parameters." am:
faf8d67749 am:
4e5024131b
am:
e2018a407a
Change-Id: I8e0f7188ff29b2fd7c34fd2a340c8b4abaac2be7
Erik Kline [Tue, 6 Jun 2017 05:05:04 +0000 (05:05 +0000)]
Merge "Support setting upstream parameters." am:
faf8d67749
am:
4e5024131b
Change-Id: I150015ea0c66be50e79f641f20d1752b9d60cb0d
Erik Kline [Tue, 6 Jun 2017 04:54:04 +0000 (04:54 +0000)]
Merge "Support setting upstream parameters."
am:
faf8d67749
Change-Id: I0be9ad265fa664f0ce6e1e098996b46c88317b97
Treehugger Robot [Tue, 6 Jun 2017 04:43:32 +0000 (04:43 +0000)]
Merge "Support setting upstream parameters."
Bryce Lee [Thu, 27 Apr 2017 20:42:23 +0000 (13:42 -0700)]
Coordinate configuration changes and window frame size.
Previously, it was possible for the view hierarchy to be measured,
laid out, and drawn around a window frame size that did not match
the current configuration. This stems from new configurations not
always propagating back from WindowSession#relayout, which is
called from ViewRootImpl.
This changelist makes WindowManagerService#relayoutWindow always
return the latest configuration. It also adds rotation to the
configuration.
Fixes:
32839232
Test: go/wm-smoke
Test: Open Camera while rotating phone to landscape. Added
temporary logs to detect inconsistencies between measurements
and reported rotation on draw.
Change-Id: I39daca338b4f87eff1a509eb99493f01e710ced1
Guang Zhu [Tue, 6 Jun 2017 03:38:52 +0000 (03:38 +0000)]
Merge "Revert "Disabled task snapshot for TV"" into oc-dev
am:
faf86491e9
Change-Id: I360c924fc3335a72c6cf46b30ee9749838e97433
Guang Zhu [Tue, 6 Jun 2017 03:29:05 +0000 (03:29 +0000)]
Merge "Revert "Disabled task snapshot for TV"" into oc-dev
Guang Zhu [Tue, 6 Jun 2017 03:27:44 +0000 (03:27 +0000)]
Revert "Disabled task snapshot for TV"
Bug:
62360140
Bug:
62040693
This reverts commit
4256422eb6752294a08f4701dd66798652a8059f.
Change-Id: Id89de52c9ad25ef7b3163bd8b4a0c44f97631431
Erik Kline [Thu, 1 Jun 2017 11:11:25 +0000 (20:11 +0900)]
Support setting upstream parameters.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
29337859
Bug:
32163131
Bug:
34361337
Change-Id: Id88cae4beed7d38aec3d29a0e2f59a5c7e6a9a4e
Todd Kennedy [Tue, 6 Jun 2017 01:49:12 +0000 (01:49 +0000)]
Merge "Don't verify instant apps" into oc-dev
am:
9bac79a540
Change-Id: I63537d6e6048152f93b5d314250334bcb1e75520
TreeHugger Robot [Tue, 6 Jun 2017 01:41:08 +0000 (01:41 +0000)]
Merge "Don't verify instant apps" into oc-dev
Christopher Tate [Tue, 6 Jun 2017 01:13:52 +0000 (18:13 -0700)]
Fix #
62350081 - annotate permission requirements
The Alarm Manager APIs that allow callers to ascribe wakelock time
to other apps are gated on the UPDATE_DEVICE_STATS permission.
Document this with the appropriate annotation.
Test: N/A
Change-Id: Idf5548089fb7d2235139ae8ba7bf58e7f455eb33
Jayachandran C [Tue, 6 Jun 2017 00:39:38 +0000 (00:39 +0000)]
Merge "Add ERI (enhanced roaming indicator) 66 to list of home ERIs for Verizon" into oc-dev
am:
4deefdbe7a
Change-Id: I57053efb8796c22899c6b0dbdafe26377f70a530
TreeHugger Robot [Tue, 6 Jun 2017 00:30:02 +0000 (00:30 +0000)]
Merge "Add ERI (enhanced roaming indicator) 66 to list of home ERIs for Verizon" into oc-dev
Keyvan Amiri [Tue, 6 Jun 2017 00:22:07 +0000 (00:22 +0000)]
Merge "Disabled task snapshot for TV" into oc-dev
am:
4cddd9a723
Change-Id: I4de52f4ac20c9f9ec99bbc810735e98f1537708e
Robert Carr [Tue, 6 Jun 2017 00:09:17 +0000 (00:09 +0000)]
Merge "Reinstate SurfaceView Background from N" into oc-dev
am:
71044d6ba1
Change-Id: I5a4e8a5c8c45add308b115bc447f85393d572e00
TreeHugger Robot [Tue, 6 Jun 2017 00:04:31 +0000 (00:04 +0000)]
Merge "Disabled task snapshot for TV" into oc-dev
TreeHugger Robot [Mon, 5 Jun 2017 23:57:01 +0000 (23:57 +0000)]
Merge "Reinstate SurfaceView Background from N" into oc-dev
OSDN Git Service
