OSDN Git Service
Chong Zhang [Fri, 12 Aug 2016 03:05:54 +0000 (03:05 +0000)]
Merge "Allow to keep screen on only if window can be seen" into nyc-mr1-dev am:
305d610fd8 am:
74670684d4
am:
541d028da4
Change-Id: I095b6af71821585064f51f3a992293b21fabc742
Andrii Kulian [Fri, 12 Aug 2016 03:05:49 +0000 (03:05 +0000)]
Allow to keep screen on only if window can be seen am:
b20addbdfb am:
19353b45e5
am:
c3e2694eb5
Change-Id: I5372d8ed619ddfd1bd141e3189396dc5c42e5f98
Chih-Hung Hsieh [Fri, 12 Aug 2016 03:05:45 +0000 (03:05 +0000)]
resolve merge conflicts of
76ce8e5 to stage-aosp-master am:
ed935c32f4 am:
ef57a0d629
am:
61bc404c0c
Change-Id: I4b57bb0e5c418a8d3305c0b337afd290a778c9b4
TreeHugger Robot [Fri, 12 Aug 2016 03:03:54 +0000 (03:03 +0000)]
Merge "resolve merge conflicts of
56996ff to master"
TreeHugger Robot [Fri, 12 Aug 2016 02:51:06 +0000 (02:51 +0000)]
Merge "Fixed NetworkPolicyManagerServiceTest."
TreeHugger Robot [Fri, 12 Aug 2016 02:16:56 +0000 (02:16 +0000)]
Merge "HWUI unit test for AVD on HwLayer"
Chih-hung Hsieh [Fri, 12 Aug 2016 02:14:32 +0000 (02:14 +0000)]
Merge "Fix clang-tidy warnings in aapt and aapt2."
Sanket Padawe [Fri, 12 Aug 2016 01:58:50 +0000 (01:58 +0000)]
Make data warning notification heads up. am:
c015e1c63c
am:
73bcc6e0f3
Change-Id: I4331b1ee94d1f8e871aaebec874959c650d2d10c
Sanket Padawe [Fri, 12 Aug 2016 01:49:21 +0000 (01:49 +0000)]
Make data warning notification heads up.
am:
c015e1c63c
Change-Id: I826fadc6fdda8707ec280b11379201f72b861362
Jin Seok Park [Fri, 12 Aug 2016 01:44:26 +0000 (01:44 +0000)]
Merge "ExifInterface: Refactor IFD type variables"
Chih-Hung Hsieh [Fri, 12 Aug 2016 01:13:57 +0000 (18:13 -0700)]
resolve merge conflicts of
56996ff to master
Change-Id: Ia5a645a3fa97408601aedc4eea19eaacb13cd947
Chong Zhang [Fri, 12 Aug 2016 00:57:02 +0000 (00:57 +0000)]
Merge "Allow to keep screen on only if window can be seen" into nyc-mr1-dev am:
305d610fd8
am:
74670684d4
Change-Id: I5480cd6b338a25e97712d94464bf6b03237cfff9
Andrii Kulian [Fri, 12 Aug 2016 00:56:58 +0000 (00:56 +0000)]
Allow to keep screen on only if window can be seen am:
b20addbdfb
am:
19353b45e5
Change-Id: Id0d729e59d156ec93a59031efa670642c1b70502
Chong Zhang [Fri, 12 Aug 2016 00:52:17 +0000 (00:52 +0000)]
Merge "Allow to keep screen on only if window can be seen" into nyc-mr1-dev
am:
305d610fd8
Change-Id: Ib3d0beeed54a52b1185456b0c859859c61548d50
Andrii Kulian [Fri, 12 Aug 2016 00:52:14 +0000 (00:52 +0000)]
Allow to keep screen on only if window can be seen
am:
b20addbdfb
Change-Id: I09e12733e8073814f8d16c3d4025db8f042c2f25
Chong Zhang [Fri, 12 Aug 2016 00:42:56 +0000 (00:42 +0000)]
Merge "Allow to keep screen on only if window can be seen" into nyc-mr1-dev
Chih-Hung Hsieh [Fri, 12 Aug 2016 00:40:25 +0000 (00:40 +0000)]
resolve merge conflicts of
76ce8e5 to stage-aosp-master am:
ed935c32f4
am:
ef57a0d629
Change-Id: Ifcc24ad835f2e74a25954bf3fd7090c75abdc084
Doris Liu [Wed, 3 Aug 2016 00:28:30 +0000 (17:28 -0700)]
HWUI unit test for AVD on HwLayer
This test puts AVD on a HWLayer and check that after prepareTree
the correct damage rect for the layer is enqueued.
This verifies the fix for bug
30166063
Change-Id: Ia37847357bb00d54f08ee253013db83d46783fbd
Chih-Hung Hsieh [Fri, 12 Aug 2016 00:31:29 +0000 (00:31 +0000)]
resolve merge conflicts of
76ce8e5 to stage-aosp-master
am:
ed935c32f4
Change-Id: Ibb7415686469d7b15e8dbe0cd04226c4e0cd7d76
TreeHugger Robot [Fri, 12 Aug 2016 00:26:35 +0000 (00:26 +0000)]
Merge "Bring back old constructor for layoutlib."
Ruben Brunk [Fri, 12 Aug 2016 00:25:10 +0000 (00:25 +0000)]
Merge "Include tids in android.util.Process exceptions." into nyc-mr1-dev am:
f36d81038a am:
fbde186842
am:
494855abe8
Change-Id: Iaa1fd9893bc1c793d2357f717dfcdb79d4134cd5
Ruben Brunk [Fri, 12 Aug 2016 00:25:04 +0000 (00:25 +0000)]
Include tids in android.util.Process exceptions. am:
4c0c4df7cf am:
f23fabf54e
am:
e6446636f9
Change-Id: I09270fb77bd064a60786853b7cdd0ffd99b083e4
Ruben Brunk [Fri, 12 Aug 2016 00:16:40 +0000 (00:16 +0000)]
Merge "Include tids in android.util.Process exceptions." into nyc-mr1-dev am:
f36d81038a
am:
fbde186842
Change-Id: Ia38c0e464c11fb71bec8793eed15017d6a33356d
Ruben Brunk [Fri, 12 Aug 2016 00:16:32 +0000 (00:16 +0000)]
Include tids in android.util.Process exceptions. am:
4c0c4df7cf
am:
f23fabf54e
Change-Id: I677f5eece0b8ea7c86541766eb6aa8c9f2b7ff94
Ruben Brunk [Fri, 12 Aug 2016 00:07:26 +0000 (00:07 +0000)]
Merge "Include tids in android.util.Process exceptions." into nyc-mr1-dev
am:
f36d81038a
Change-Id: Ia3a3ab547f93158dbec22fa89939ec8939a3f6aa
Ruben Brunk [Fri, 12 Aug 2016 00:07:24 +0000 (00:07 +0000)]
Include tids in android.util.Process exceptions.
am:
4c0c4df7cf
Change-Id: Ic0950e41aaa767e00610a77a57145c4a1bac2c85
Ruben Brunk [Fri, 12 Aug 2016 00:00:35 +0000 (00:00 +0000)]
Merge "Include tids in android.util.Process exceptions." into nyc-mr1-dev
Chih-Hung Hsieh [Thu, 11 Aug 2016 23:48:46 +0000 (16:48 -0700)]
resolve merge conflicts of
76ce8e5 to stage-aosp-master
Change-Id: I4b4ca9906373a95776d2da8ba2fa39a4a78e2a30
Lei Yu [Thu, 11 Aug 2016 23:44:47 +0000 (23:44 +0000)]
Merge "Change the function "setPolicyLimitBytes" and "setPolicyWarningBytes"."
Chong Zhang [Thu, 11 Aug 2016 23:36:04 +0000 (23:36 +0000)]
Merge "Fix build break due to
44089019"
Sanket Padawe [Thu, 11 Aug 2016 23:34:10 +0000 (16:34 -0700)]
Make data warning notification heads up.
Bug:
30760683
Change-Id: Id3fed0a62936dddabcb169536a4a917d750259d7
Chong Zhang [Thu, 11 Aug 2016 23:27:43 +0000 (16:27 -0700)]
Fix build break due to
44089019
Change-Id: I8be137ab667f024b3ae5cbd17344e0bb4bc322ee
Treehugger Robot [Thu, 11 Aug 2016 23:20:47 +0000 (23:20 +0000)]
Merge "Fix clang-tidy warnings in libs/hwui."
Jakub Pawlowski [Thu, 11 Aug 2016 23:17:53 +0000 (23:17 +0000)]
resolve merge conflicts of
5671277 to stage-aosp-master am:
5aa4ba3776 am:
84b61fb4b0
am:
ecd10beefd
Change-Id: I4d72144cfd66a51fe8e2aaaf93ed4c4981830d3b
Jakub Pawlowski [Thu, 11 Aug 2016 23:11:19 +0000 (23:11 +0000)]
resolve merge conflicts of
5671277 to stage-aosp-master am:
5aa4ba3776
am:
84b61fb4b0
Change-Id: Id1dc84ba248e6d91bcab28f94b9c2b29dc16787d
Jakub Pawlowski [Thu, 11 Aug 2016 23:05:49 +0000 (23:05 +0000)]
resolve merge conflicts of
5671277 to stage-aosp-master
am:
5aa4ba3776
Change-Id: Id0926a640dd15d33d6df9582009d587d7bed1872
Jeff Sharkey [Thu, 11 Aug 2016 22:54:13 +0000 (16:54 -0600)]
Bring back old constructor for layoutlib.
Bug:
28634953
Change-Id: I72edcdc498b4d85d68e85768dcf839ecb1ab5db7
Jakub Pawlowski [Thu, 11 Aug 2016 22:53:06 +0000 (15:53 -0700)]
resolve merge conflicts of
5671277 to stage-aosp-master
Change-Id: I71e3bd497dbdc0b3f297ad311620aa77bf7225ac
Jakub Pawlowski [Thu, 11 Aug 2016 22:32:22 +0000 (22:32 +0000)]
Merge "Add LE Secure Connection data parsing (1/4)"
Jakub Pawlowski [Thu, 28 Jul 2016 12:21:36 +0000 (05:21 -0700)]
Add LE Secure Connection data parsing (1/4)
Bug:
30460956
Change-Id: I8d6e721b3b04f5ca9e3e02f7f2b90487482e1b37
Chih-Hung Hsieh [Wed, 10 Aug 2016 21:15:30 +0000 (14:15 -0700)]
Fix clang-tidy warnings in aapt and aapt2.
* Add explicit keyword to conversion constructors.
* Add NOLINT(implicit) comments for implicit conversion constructors.
Bug:
28341362
* Use const reference type for read-only parameters.
Bug:
30407689
* Use const reference type to avoid unnecessary copy.
Bug:
30413862
Test: build with WITH_TIDY=1
Change-Id: Id6d21961f313a1ad92b15a37fdaa5be9e8ab48e1
Amith Yamasani [Thu, 11 Aug 2016 22:02:57 +0000 (22:02 +0000)]
Merge "Clean up when recycling a pid with a pending launch" into nyc-mr1-dev am:
792aaab77a am:
c76f8c1b55
am:
1727db3961
Change-Id: I5240e943a397f59f4095ede9b3b618836c3ad4ba
Amith Yamasani [Thu, 11 Aug 2016 22:02:53 +0000 (22:02 +0000)]
Clean up when recycling a pid with a pending launch am:
d86e14e45c am:
92de60bd7f
am:
1fa3fd30bd
Change-Id: Ib4e36dc0be9c6a73907bbdf7f146a20e0d2eeb3f
Wale Ogunwale [Thu, 11 Aug 2016 22:02:14 +0000 (22:02 +0000)]
Merge changes Ide94af72,Ie2c94439 into nyc-mr1-dev am:
efa21a9924 am:
70d32b3d22
am:
57d2fbce83
Change-Id: I3d002df3a23b26c18e3b3507fbcec69d58a69140
Wale Ogunwale [Thu, 11 Aug 2016 22:01:41 +0000 (22:01 +0000)]
Clear WS.mDestroying on AWT.clearAnimatingFlags am:
3c0d44e633 am:
5d132bf021
am:
440890193f
Change-Id: I033ce2d6cc9ead32c9158457dca218d3e8b10857
Chong Zhang [Thu, 11 Aug 2016 21:56:20 +0000 (21:56 +0000)]
Some fixes for transition animation selection am:
808621ca54 am:
3d2acc1ab6
am:
867d9569df -s ours
Change-Id: Ib224b9103f8cb32f12fa75f4474f38dab8443038
Jeff Sharkey [Thu, 11 Aug 2016 21:21:53 +0000 (21:21 +0000)]
Merge "Take the "tf" out of "wtf"."
Jeff Sharkey [Thu, 11 Aug 2016 21:20:23 +0000 (15:20 -0600)]
Take the "tf" out of "wtf".
You can't DropBox until you have DropBox, otherwise bad things will
happen.
Bug:
28634953
Change-Id: I43c590ac329c7a544215df3023ad07a0b32b5691
Amith Yamasani [Thu, 11 Aug 2016 21:19:53 +0000 (21:19 +0000)]
Merge "Clean up when recycling a pid with a pending launch" into nyc-mr1-dev am:
792aaab77a
am:
c76f8c1b55
Change-Id: If18b8d2947a1bcddeda6f3cc7c74b8ce7ea536f5
Amith Yamasani [Thu, 11 Aug 2016 21:19:49 +0000 (21:19 +0000)]
Clean up when recycling a pid with a pending launch am:
d86e14e45c
am:
92de60bd7f
Change-Id: Iedb5153b37f8e240b545c97b99248a18e9f8613e
Wale Ogunwale [Thu, 11 Aug 2016 21:19:45 +0000 (21:19 +0000)]
Merge changes Ide94af72,Ie2c94439 into nyc-mr1-dev am:
efa21a9924
am:
70d32b3d22
Change-Id: I7b235a555e585900e7949f79757d7555e277270d
Wale Ogunwale [Thu, 11 Aug 2016 21:19:10 +0000 (21:19 +0000)]
Clear WS.mDestroying on AWT.clearAnimatingFlags am:
3c0d44e633
am:
5d132bf021
Change-Id: I637742001089d128a22762411b35b5973dd604ae
Chong Zhang [Thu, 11 Aug 2016 21:18:37 +0000 (21:18 +0000)]
Some fixes for transition animation selection am:
808621ca54
am:
3d2acc1ab6
Change-Id: I0158f63b4ad154aabe0a53a8b8030ab914f76c29
Phil Weaver [Thu, 11 Aug 2016 21:12:00 +0000 (21:12 +0000)]
Merge "Limit capabilities of a11y gesture dispatch." into nyc-mr1-dev am:
364580d20a am:
f933858b07
am:
807eb48292
Change-Id: I5dffed06abf7f88ee556f78407adc036d192fee4
Phil Weaver [Thu, 11 Aug 2016 21:11:57 +0000 (21:11 +0000)]
Limit capabilities of a11y gesture dispatch. am:
a8918f23c7 am:
0e97bb6c1a
am:
3d40beacfd
Change-Id: I006b848679d7e605740e1e1e9eecddad7878873b
Phil Weaver [Thu, 11 Aug 2016 21:11:53 +0000 (21:11 +0000)]
Merge "Don't preserve a11y focus in hierarchy state." into nyc-mr1-dev am:
aefa892035 am:
4e1d6f439a
am:
cdcb846081
Change-Id: I356b0ab5ed7827738a22e25421e640c2e7921b0d
Phil Weaver [Thu, 11 Aug 2016 21:11:49 +0000 (21:11 +0000)]
Don't preserve a11y focus in hierarchy state. am:
f40ee509c6 am:
711d7260ba
am:
99633b3700
Change-Id: I681bd187bc1bc8621a82d177e11033e2845bb437
Amith Yamasani [Thu, 11 Aug 2016 21:06:23 +0000 (21:06 +0000)]
Merge "Clean up when recycling a pid with a pending launch" into nyc-mr1-dev
am:
792aaab77a
Change-Id: I908d6adb238d47b42f4c756e07ec1d0ac137f8d5
Amith Yamasani [Thu, 11 Aug 2016 21:05:51 +0000 (21:05 +0000)]
Clean up when recycling a pid with a pending launch
am:
d86e14e45c
Change-Id: If77af8cc8a0b9620c2fc5e4704c178667fc0703e
Wale Ogunwale [Thu, 11 Aug 2016 21:05:48 +0000 (21:05 +0000)]
Merge changes Ide94af72,Ie2c94439 into nyc-mr1-dev
am:
efa21a9924
Change-Id: I540bf405007052af240d58a4e390cbbbda9011e8
Wale Ogunwale [Thu, 11 Aug 2016 21:05:45 +0000 (21:05 +0000)]
Clear WS.mDestroying on AWT.clearAnimatingFlags
am:
3c0d44e633
Change-Id: I7188dc89d20ee7d96f99e0116cef0eaa4b1bcc4e
Chong Zhang [Thu, 11 Aug 2016 21:05:17 +0000 (21:05 +0000)]
Some fixes for transition animation selection
am:
808621ca54
Change-Id: I9ded235ab5d8942ba66e4dbcb769169565eb4304
Phil Weaver [Thu, 11 Aug 2016 21:04:01 +0000 (21:04 +0000)]
Merge "Limit capabilities of a11y gesture dispatch." into nyc-mr1-dev am:
364580d20a
am:
f933858b07
Change-Id: I22e571503489cd6300a9f475a3faca58da528883
Phil Weaver [Thu, 11 Aug 2016 21:03:28 +0000 (21:03 +0000)]
Limit capabilities of a11y gesture dispatch. am:
a8918f23c7
am:
0e97bb6c1a
Change-Id: Ibb5b330e3ffe8530c6a506311146bc3597bd512b
Phil Weaver [Thu, 11 Aug 2016 21:03:22 +0000 (21:03 +0000)]
Merge "Don't preserve a11y focus in hierarchy state." into nyc-mr1-dev am:
aefa892035
am:
4e1d6f439a
Change-Id: Id2fbc3ae31e60d2940be6c9fbf01147f5d3d376d
Phil Weaver [Thu, 11 Aug 2016 21:03:19 +0000 (21:03 +0000)]
Don't preserve a11y focus in hierarchy state. am:
f40ee509c6
am:
711d7260ba
Change-Id: I7b2f1b2955c279f21f8f7a5ffc7b615ddaa50ff5
Chong Zhang [Thu, 11 Aug 2016 21:02:11 +0000 (21:02 +0000)]
Merge "Dump out last real used app transit type" into nyc-mr1-dev am:
b1dfc3e7e1 am:
c88f140ee4
am:
fd553e523d
Change-Id: I8f21a5f68c7c682879bdbfde171c0bfa2719e34c
Chong Zhang [Thu, 11 Aug 2016 21:02:08 +0000 (21:02 +0000)]
Dump out last real used app transit type am:
60091a978f am:
3d2bf37da1
am:
5222f440b0
Change-Id: I3dea11a349eb94443796d6a87c0d72c256ecd573
Chong Zhang [Thu, 11 Aug 2016 20:55:17 +0000 (20:55 +0000)]
Merge "Dump out last real used app transit type" into nyc-mr1-dev am:
b1dfc3e7e1
am:
c88f140ee4
Change-Id: I7889b6239c319d5f5d456c383e659b56796376e5
Chong Zhang [Thu, 11 Aug 2016 20:55:12 +0000 (20:55 +0000)]
Dump out last real used app transit type am:
60091a978f
am:
3d2bf37da1
Change-Id: Ia31640768df6a5fb05efaa4307066e7dd8c461af
Phil Weaver [Thu, 11 Aug 2016 20:53:47 +0000 (20:53 +0000)]
Merge "Limit capabilities of a11y gesture dispatch." into nyc-mr1-dev
am:
364580d20a
Change-Id: I84aef92197ee41a92351a32df7326fd91801e8f3
Phil Weaver [Thu, 11 Aug 2016 20:53:44 +0000 (20:53 +0000)]
Limit capabilities of a11y gesture dispatch.
am:
a8918f23c7
Change-Id: I8c14c8b8ada7e7c53b17be2df63c14c4e0e10c83
Phil Weaver [Thu, 11 Aug 2016 20:53:40 +0000 (20:53 +0000)]
Merge "Don't preserve a11y focus in hierarchy state." into nyc-mr1-dev
am:
aefa892035
Change-Id: Ic2403a6e01ee7e35bc364b2f8fec5f4fcc37a24f
Phil Weaver [Thu, 11 Aug 2016 20:53:37 +0000 (20:53 +0000)]
Don't preserve a11y focus in hierarchy state.
am:
f40ee509c6
Change-Id: I14ba7354058eef6942286483b3f61ea0404135ea
Amith Yamasani [Thu, 11 Aug 2016 20:48:26 +0000 (20:48 +0000)]
Merge "Clean up when recycling a pid with a pending launch" into nyc-mr1-dev
Chris Tate [Thu, 11 Aug 2016 20:43:52 +0000 (20:43 +0000)]
Merge "Check system & lock wallpaper backup eligibility independently" into nyc-mr1-dev am:
dd59a27f2e am:
949afd5eaf
am:
338d0e07b6
Change-Id: Ice435754f2057cf559924eefef9bd775a6734856
Christopher Tate [Thu, 11 Aug 2016 20:43:44 +0000 (20:43 +0000)]
Check system & lock wallpaper backup eligibility independently am:
6172266154 am:
611afaf4ae
am:
9649aecab6
Change-Id: I8c4dd55fa63f0a9ffbcd7992ee29040f79ae1780
Wale Ogunwale [Thu, 11 Aug 2016 20:43:26 +0000 (20:43 +0000)]
Merge changes Ide94af72,Ie2c94439 into nyc-mr1-dev
* changes:
Clear WS.mDestroying on AWT.clearAnimatingFlags
Some fixes for transition animation selection
Chong Zhang [Thu, 11 Aug 2016 20:43:28 +0000 (20:43 +0000)]
Merge "Dump out last real used app transit type" into nyc-mr1-dev
am:
b1dfc3e7e1
Change-Id: Iaab588bf3527920b754a2b8815d3d99ba3ce5cf7
Chong Zhang [Thu, 11 Aug 2016 20:43:27 +0000 (20:43 +0000)]
Dump out last real used app transit type
am:
60091a978f
Change-Id: Iafeb1d21ab90c9ea124bfb6911abc1ad9165895d
Chris Tate [Thu, 11 Aug 2016 20:35:48 +0000 (20:35 +0000)]
Merge "Check system & lock wallpaper backup eligibility independently" into nyc-mr1-dev am:
dd59a27f2e
am:
949afd5eaf
Change-Id: I25f687dc7d87efd1da1bac45722b5581b0fe0683
Christopher Tate [Thu, 11 Aug 2016 20:35:43 +0000 (20:35 +0000)]
Check system & lock wallpaper backup eligibility independently am:
6172266154
am:
611afaf4ae
Change-Id: I5d8361f2854647fae86847828d58154af06618c8
Phil Weaver [Thu, 11 Aug 2016 20:35:11 +0000 (20:35 +0000)]
Merge "Limit capabilities of a11y gesture dispatch." into nyc-mr1-dev
Phil Weaver [Thu, 11 Aug 2016 20:34:41 +0000 (20:34 +0000)]
Merge "Don't preserve a11y focus in hierarchy state." into nyc-mr1-dev
TreeHugger Robot [Thu, 11 Aug 2016 20:29:41 +0000 (20:29 +0000)]
Merge "Dump out last real used app transit type" into nyc-mr1-dev
Chris Tate [Thu, 11 Aug 2016 20:28:48 +0000 (20:28 +0000)]
Merge "Check system & lock wallpaper backup eligibility independently" into nyc-mr1-dev
am:
dd59a27f2e
Change-Id: I9b1f2951d80832182afb11e87a9e56acb80a302b
Christopher Tate [Thu, 11 Aug 2016 20:28:44 +0000 (20:28 +0000)]
Check system & lock wallpaper backup eligibility independently
am:
6172266154
Change-Id: I1bfe06d10c1a68b23d4ba8cb4648099f482a22e5
Chris Tate [Thu, 11 Aug 2016 20:20:08 +0000 (20:20 +0000)]
Merge "Check system & lock wallpaper backup eligibility independently" into nyc-mr1-dev
Esteban Talavera [Thu, 11 Aug 2016 19:11:58 +0000 (19:11 +0000)]
Merge "Do not toggle OEM unlock if bootloader unlocked" into nyc-mr1-dev am:
fd97e7bc8c am:
5c96b0d1ab
am:
5d8bd029a8
Change-Id: I6dc9d8a52c948cd0cdd97ad7af2cb44c0bca76c5
Esteban Talavera [Thu, 11 Aug 2016 19:11:52 +0000 (19:11 +0000)]
Do not toggle OEM unlock if bootloader unlocked am:
c48b20f8f1 am:
83583bd596
am:
b9bef2fb7d
Change-Id: I87ffae46a63f1543b55e075cecffb1d2c2e1c160
Esteban Talavera [Thu, 11 Aug 2016 19:00:40 +0000 (19:00 +0000)]
Merge "Do not toggle OEM unlock if bootloader unlocked" into nyc-mr1-dev am:
fd97e7bc8c
am:
5c96b0d1ab
Change-Id: Idbb8416e0f3e20e57568a5e3d0f2cb7a202f7742
Esteban Talavera [Thu, 11 Aug 2016 19:00:37 +0000 (19:00 +0000)]
Do not toggle OEM unlock if bootloader unlocked am:
c48b20f8f1
am:
83583bd596
Change-Id: Ib8293a02ca13587154133a939c4515de1a114bd9
Esteban Talavera [Thu, 11 Aug 2016 18:54:17 +0000 (18:54 +0000)]
Merge "Do not toggle OEM unlock if bootloader unlocked" into nyc-mr1-dev
am:
fd97e7bc8c
Change-Id: I383fd638d92e62a1a83d91c2088b78c6fd4bba3f
Esteban Talavera [Thu, 11 Aug 2016 18:54:14 +0000 (18:54 +0000)]
Do not toggle OEM unlock if bootloader unlocked
am:
c48b20f8f1
Change-Id: Ic42a52cc9d71aa1192de0a052efb23a625673232
Jeff Sharkey [Thu, 11 Aug 2016 18:52:43 +0000 (18:52 +0000)]
Merge "Fix bugs around manager fetching."
Jeff Sharkey [Thu, 11 Aug 2016 18:52:02 +0000 (18:52 +0000)]
Merge "Avoid caching services with missing binders."
TreeHugger Robot [Thu, 11 Aug 2016 18:45:25 +0000 (18:45 +0000)]
Merge "Do not toggle OEM unlock if bootloader unlocked" into nyc-mr1-dev
Alexandria Cornwall [Thu, 11 Aug 2016 18:33:01 +0000 (18:33 +0000)]
Merge "AAPT2: Reorder link steps"
Christopher Tate [Wed, 10 Aug 2016 23:13:14 +0000 (16:13 -0700)]
Check system & lock wallpaper backup eligibility independently
Bug
30751829
Change-Id: Ic94689dd63238449222d1aea07231d9fd29fc76d
Felipe Leme [Wed, 10 Aug 2016 21:46:39 +0000 (14:46 -0700)]
Fixed NetworkPolicyManagerServiceTest.
NetworkPolicyManagerServiceTest had many tests there were @Suppressed
because they were obsolete and harder to fix using Easymocks.
This CL replaced EasyMock by Mockito and re-enabled most tests, although
some tests were removed because:
- It's underlying logic changed too much that.
- It would be hard to mock all external entities they interact with.
- They are covered by CTS tests.
Fixes:
30764608
Change-Id: I53ff86fc9b64cb058846f1aefa244771630d9e1e
OSDN Git Service
