Commit Graph

325625 Commits

Author SHA1 Message Date
TreeHugger Robot
edb9af3e17 Merge "Replace mockito with a mock class in DynamicLayoutTest" 2017-06-07 00:45:09 +00:00
Marco Nelissen
9027504915 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
am: 3f4a368a7c

Change-Id: I9675446964d2bd5672fe87674571dae517f5ba3d
2017-06-07 00:39:56 +00:00
Marco Nelissen
3f4a368a7c 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
2017-06-07 00:31:38 +00:00
Marco Nelissen
5301c498fe 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
am: 031a20a6c7

Change-Id: I5039c6fc8c0a18fcf14edd30f94975fff6c1fc35
2017-06-07 00:31:33 +00:00
Marco Nelissen
031a20a6c7 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
2017-06-07 00:24:23 +00:00
Marco Nelissen
6596f721fd 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
2017-06-07 00:20:21 +00:00
Marco Nelissen
2c1d4f8f7b 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
2017-06-07 00:16:34 +00:00
Marco Nelissen
9e4e6c4b7c 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
2017-06-07 00:10:27 +00:00
Marco Nelissen
db9d2588b8 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
2017-06-07 00:04:12 +00:00
Rob Carr
198aa2bcda Merge "SurfaceView: Correct inverted alpha detection condition." into oc-dev am: 3946916d56
am: 8296054d4e

Change-Id: Iaf35647355f48300199d888eb884a23750c0059b
2017-06-07 00:03:51 +00:00
Marco Nelissen
d7fe3ea6a8 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
2017-06-06 23:54:55 +00:00
Felipe Leme
04e794c12b Merge "Catch WindowManager exceptions so they don't crash the system." into oc-dev am: 301fc823f3
am: 9a1b6b0eb2

Change-Id: Ifbda0a75a79e644763e83baf86a7823310a56f5b
2017-06-06 23:53:16 +00:00
Rob Carr
8296054d4e Merge "SurfaceView: Correct inverted alpha detection condition." into oc-dev
am: 3946916d56

Change-Id: Ia2d5ff30183d8588319dc4aa24f5512f3db75e55
2017-06-06 23:52:56 +00:00
Android Build Merger (Role)
38e49013e0 Merge "Merge "Handle renamed packages during default grants" into oc-dev am: bfc083c3a0 am: 7e05bb7793" 2017-06-06 23:49:24 +00:00
Todd Kennedy
2317bfc643 Merge "Handle renamed packages during default grants" into oc-dev am: bfc083c3a0
am: 7e05bb7793

Change-Id: Ib4e3b2799c2a104fd203b6e64e86d6181567b177
2017-06-06 23:48:19 +00:00
Christine Franks
4cdd6209ee Merge "Add TRON counter for demo user creation" 2017-06-06 23:47:52 +00:00
Marco Nelissen
4d9e6150f3 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
2017-06-06 23:45:51 +00:00
Felipe Leme
9a1b6b0eb2 Merge "Catch WindowManager exceptions so they don't crash the system." into oc-dev
am: 301fc823f3

Change-Id: Ib28ae2a7b3614fa73fa4e1b08e5607f7d6011891
2017-06-06 23:44:42 +00:00
Isai Damier
4f64bd564c Merge "Redundant/duplicate method to close Streams Fixes: 62304559 Test: the code compiles which mean polymorphism works. No additional tests necessary Change-Id: I3d366f12c1f176213979da6b050957bc2adb2938" 2017-06-06 23:43:49 +00:00
Todd Kennedy
7e05bb7793 Merge "Handle renamed packages during default grants" into oc-dev
am: bfc083c3a0

Change-Id: I068bb7548d1c972c3824185e5ab933a7b48c387b
2017-06-06 23:41:06 +00:00
Marco Nelissen
ce5c72e887 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
2017-06-06 23:39:57 +00:00
Marco Nelissen
69b6a382a3 Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1
am: e18e8c4113

Change-Id: I5c34b680b1c7abcfd33c8719406516fe796afebb
2017-06-06 23:33:50 +00:00
Rob Carr
3946916d56 Merge "SurfaceView: Correct inverted alpha detection condition." into oc-dev 2017-06-06 23:33:04 +00:00
Felipe Leme
301fc823f3 Merge "Catch WindowManager exceptions so they don't crash the system." into oc-dev 2017-06-06 23:31:01 +00:00
Todd Kennedy
bfc083c3a0 Merge "Handle renamed packages during default grants" into oc-dev 2017-06-06 23:29:10 +00:00
Marco Nelissen
e18e8c4113 Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2
am: 3272cf26c1

Change-Id: I92f069aa6f3a897f9bfba4405dcd64dc066db944
2017-06-06 23:28:27 +00:00
Daniel Sheng
18c44c5b08 Merge "Changed camera lift trigger to default-on." 2017-06-06 23:26:10 +00:00
Marco Nelissen
3272cf26c1 Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546
am: 6d5bc9a3c2

Change-Id: I8165c2218d0d5de41468f8acff86a720c03d1f52
2017-06-06 23:22:14 +00:00
Marco Nelissen
6d5bc9a3c2 Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64
am: 4b78a79546

Change-Id: Iceb4edfd80a0a483d28f2624669eff9dd86bfcb8
2017-06-06 23:16:24 +00:00
Selim Cinek
2e59523ce6 Merge "Fixed an issue where would could be left with empty notifications" into oc-dev am: 25e509462f
am: b8c7c9ee2d

Change-Id: I8560e900e1c0c2cf7caf1ba748a5b928ff69f638
2017-06-06 23:11:15 +00:00
Marco Nelissen
4b78a79546 Merge "Close connection before retrying" into lmp-dev am: a8648ecebb
am: 5181a7ab64

Change-Id: I34a176a0da235836eaa9e44b843ec5d5654b8db9
2017-06-06 23:10:16 +00:00
TreeHugger Robot
d525148c98 Merge "Add logging to track search no-result case" 2017-06-06 23:04:04 +00:00
Selim Cinek
b8c7c9ee2d Merge "Fixed an issue where would could be left with empty notifications" into oc-dev
am: 25e509462f

Change-Id: I69457f9a26085bc98e24b0c975106ddaa3199e98
2017-06-06 23:02:41 +00:00
Marco Nelissen
5181a7ab64 Merge "Close connection before retrying" into lmp-dev
am: a8648ecebb

Change-Id: I744fdb979aa2803b53d3ff6f4e3e72f6f1160d74
2017-06-06 23:02:35 +00:00
Daniel Sandler
059e6eb632 Merge "resolve merge conflicts of be23ef368f to oc-dev-plus-aosp" into oc-dev-plus-aosp
am: 9dd289529d

Change-Id: Ic2151c9a6a4f8ff1d76effa5b935ffa3e43bb0d8
2017-06-06 23:00:53 +00:00
TreeHugger Robot
25e509462f Merge "Fixed an issue where would could be left with empty notifications" into oc-dev 2017-06-06 22:54:43 +00:00
TreeHugger Robot
a8648ecebb Merge "Close connection before retrying" into lmp-dev 2017-06-06 22:54:01 +00:00
Daniel Sandler
9dd289529d Merge "resolve merge conflicts of be23ef368f to oc-dev-plus-aosp" into oc-dev-plus-aosp 2017-06-06 22:53:07 +00:00
Roozbeh Pournader
de0353dbc7 Replace mockito with a mock class in DynamicLayoutTest
Previously, a mocked object was used incorrectly in the test. It was
attached twice as a span, which would result in the second identical
span causing the first span to get removed.

Now we use two different instances of a mock class, to make sure we
are attaching different spans.

Fixes: 62217995
Test: adb shell am instrument -w -e package android.text com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner

Change-Id: Ib9f7a467410d28280d77a1023e0fc328c652e2af
2017-06-06 15:49:42 -07:00
Keyvan Amiri
33089c090b Merge "Disabled task snapshot for TV" into oc-dev am: 08b953dd2e
am: 6cae189d26

Change-Id: I4c71d58c3f9d640abaa941324c570c6168002cad
2017-06-06 22:13:48 +00:00
sunjian
b6fb6f2b60 Update AccountManagerService side logic for .getAccountsByTypeForPackage with null type. am: d62dc39dc5
am: b22429d53f

Change-Id: I40675817d0102c51a4ad4988bc4c1445842883b3
2017-06-06 22:11:19 +00:00
Keyvan Amiri
6cae189d26 Merge "Disabled task snapshot for TV" into oc-dev
am: 08b953dd2e

Change-Id: I220460741e82abbfaf3746763cbb4b09e9357965
2017-06-06 22:05:13 +00:00
TreeHugger Robot
08b953dd2e Merge "Disabled task snapshot for TV" into oc-dev 2017-06-06 21:56:26 +00:00
sunjian
b22429d53f Update AccountManagerService side logic for .getAccountsByTypeForPackage with null type.
am: d62dc39dc5

Change-Id: Idf3475786676e9713e4fa5756ecce9c675da8c3e
2017-06-06 21:56:07 +00:00
Julius D'souza
44da336ce8 Merge "Add state machine model for skipping initial brightness ramps." into oc-dev am: 9fd3076fe6
am: cc162a1e4f

Change-Id: If743c9ed506aa6e1035303d50c48de7093a8c7e7
2017-06-06 21:48:26 +00:00
sunjian
d62dc39dc5 Update AccountManagerService side logic for .getAccountsByTypeForPackage
with null type.

Bug: 37987384
Test: manual, APCT
Change-Id: I4d5f735736f1b1d7bbf778aee2ec813071c34f19
2017-06-06 21:45:58 +00:00
Aurimas Liutikas
7b62dc3aec Merge "Remove usages of ActionBarActivity." into oc-dev am: c742b8ab2d
am: 964993e9aa

Change-Id: I6f6e5c06b274d55f47483fd4d7bf20d50c08741b
2017-06-06 21:45:45 +00:00
TreeHugger Robot
39d69b84c9 Merge "AAPT2: Do not interpret %n as a format specifier in string resources" 2017-06-06 21:40:00 +00:00
Julius D'souza
cc162a1e4f Merge "Add state machine model for skipping initial brightness ramps." into oc-dev
am: 9fd3076fe6

Change-Id: If95a7b60b75f06eb3c67de24b837c26ce259db92
2017-06-06 21:36:50 +00:00
TreeHugger Robot
d131f19c50 Merge "Add new haptic feedback constant for virtual key release." 2017-06-06 21:35:51 +00:00