git.osdn.net Git - android-x86/frameworks-base.git/log

OSDN Git Service

(root) / android-x86 / frameworks-base.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Fyodor Kupolov [Fri, 10 Mar 2017 03:23:34 +0000 (03:23 +0000)]

Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a -s ours am: de9cb7ed68 -s ours am: 2c112c4ad2 am: 2411b4f774 -s ours
am: aa0b718886

Change-Id: Ife44fe3b8b295901699de0043dba5bcdc06f32f3

commit | commitdiff | tree

Fyodor Kupolov [Fri, 10 Mar 2017 03:17:46 +0000 (03:17 +0000)]

Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a -s ours am: de9cb7ed68 -s ours am: 2c112c4ad2
am: 2411b4f774 -s ours

Change-Id: Ie78ad1a602d6502c09a98ee9e28119caab3534b7

commit | commitdiff | tree

Fyodor Kupolov [Fri, 10 Mar 2017 03:12:06 +0000 (03:12 +0000)]

Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a -s ours am: de9cb7ed68 -s ours
am: 2c112c4ad2

Change-Id: Ic108a0750248d001873de33d69984e6cf2c3584a

commit | commitdiff | tree

Fyodor Kupolov [Fri, 10 Mar 2017 03:06:31 +0000 (03:06 +0000)]

Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a -s ours
am: de9cb7ed68 -s ours

Change-Id: I2f94e2ea49c05a29308ca2351a083377350bb2ab

commit | commitdiff | tree

Fyodor Kupolov [Fri, 10 Mar 2017 03:00:46 +0000 (03:00 +0000)]

Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70
am: 156fa32e2a -s ours

Change-Id: Ic4e51daa36c395f2e3b538658649ff9104bb962c

commit | commitdiff | tree

Fyodor Kupolov [Fri, 10 Mar 2017 02:55:07 +0000 (02:55 +0000)]

Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354
am: a821245d70

Change-Id: I1e47c963728906cb2283a353c882017368d07747

commit | commitdiff | tree

Fyodor Kupolov [Fri, 10 Mar 2017 02:49:34 +0000 (02:49 +0000)]

Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev
am: ac87aee354

Change-Id: I5bbdc48120f2d03b4ad6605bfeccd5ccdc8c7958

commit | commitdiff | tree

Fyodor Kupolov [Fri, 10 Mar 2017 02:39:09 +0000 (02:39 +0000)]

Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev

commit | commitdiff | tree

Fyodor Kupolov [Fri, 10 Mar 2017 02:21:44 +0000 (02:21 +0000)]

Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am: d2e8e1488a -s ours am: 1e6d3f904e am: ce677737ec -s ours
am: b76704bf25

Change-Id: I4dfd0be0c7ab642e3d743062da218950a4b4129f

commit | commitdiff | tree

Fyodor Kupolov [Fri, 10 Mar 2017 02:18:04 +0000 (02:18 +0000)]

[DO NOT MERGE] Throw exception if slot has invalid offset am: 69e347f7ef -s ours am: 1c732801ab am: 78861ad53e -s ours
am: 13df27e68b

Change-Id: I7b7c03f9b744957378aef17f26ac4a66f9c747e3

commit | commitdiff | tree

Fyodor Kupolov [Fri, 10 Mar 2017 02:14:07 +0000 (02:14 +0000)]

Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am: d2e8e1488a -s ours am: 1e6d3f904e
am: ce677737ec -s ours

Change-Id: I4ef50e6ff43d354f1542a0c1bb486ebfe14309e8

commit | commitdiff | tree

Fyodor Kupolov [Fri, 10 Mar 2017 02:10:31 +0000 (02:10 +0000)]

[DO NOT MERGE] Throw exception if slot has invalid offset am: 69e347f7ef -s ours am: 1c732801ab
am: 78861ad53e -s ours

Change-Id: I32668e97f69f63e798cab1e62f68deae861ec96e

commit | commitdiff | tree

Fyodor Kupolov [Fri, 10 Mar 2017 02:08:00 +0000 (02:08 +0000)]

Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev am: e1766acb41 am: 105b0ff30c -s ours
am: 677a8879c0

Change-Id: I890acbc20da8c6637642e9718e0748273bfe22be

commit | commitdiff | tree

Fyodor Kupolov [Fri, 10 Mar 2017 02:07:27 +0000 (02:07 +0000)]

Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am: d2e8e1488a -s ours
am: 1e6d3f904e

Change-Id: I50a91bc415fb1aa9b0baf8eb48e208f3792425bc

commit | commitdiff | tree

Fyodor Kupolov [Fri, 10 Mar 2017 02:03:24 +0000 (02:03 +0000)]

[DO NOT MERGE] Throw exception if slot has invalid offset am: 69e347f7ef -s ours
am: 1c732801ab

Change-Id: I5edf742dbf962ce2a863996b71192ccca038705e

commit | commitdiff | tree

Fyodor Kupolov [Fri, 10 Mar 2017 02:03:16 +0000 (02:03 +0000)]

Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev am: e1766acb41
am: 105b0ff30c -s ours

Change-Id: Iec5bbb651da033182ec99e9b10e10c098724a5a0

commit | commitdiff | tree

Fyodor Kupolov [Fri, 10 Mar 2017 02:02:30 +0000 (02:02 +0000)]

Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev
am: d2e8e1488a -s ours

Change-Id: I85273c31137127b733b51579c55618326d67a88c

commit | commitdiff | tree

Fyodor Kupolov [Fri, 10 Mar 2017 01:56:58 +0000 (01:56 +0000)]

Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev
am: e1766acb41

Change-Id: I5bfc6d7e47772f0aabcc0567e52c6534ba6815c9

commit | commitdiff | tree

Fyodor Kupolov [Fri, 10 Mar 2017 01:55:54 +0000 (01:55 +0000)]

[DO NOT MERGE] Throw exception if slot has invalid offset
am: 69e347f7ef -s ours

Change-Id: I5b06e8493703961f828894358a05c9cc70856fa9

commit | commitdiff | tree

Fyodor Kupolov [Fri, 10 Mar 2017 01:54:48 +0000 (01:54 +0000)]

Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into mnc-dev
am: d2699d009b

Change-Id: If4e1c8bff81a3e9a7c4e4c94a2a3ea0a2d4cc9ba

commit | commitdiff | tree

Fyodor Kupolov [Fri, 10 Mar 2017 01:51:13 +0000 (01:51 +0000)]

Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev

commit | commitdiff | tree

Fyodor Kupolov [Fri, 10 Mar 2017 01:50:38 +0000 (01:50 +0000)]

Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev

commit | commitdiff | tree

Fyodor Kupolov [Fri, 10 Mar 2017 01:49:54 +0000 (01:49 +0000)]

Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into mnc-dev

commit | commitdiff | tree

Fyodor Kupolov [Thu, 9 Mar 2017 20:24:29 +0000 (20:24 +0000)]

[DO NOT MERGE] Check bounds in offsetToPtr am: 7b83d625aa am: 2d54d2c0d5 am: 305a41b7a6 -s ours am: e0f30ecdb9 -s ours am: a482ac81a5 am: b50794ec65 -s ours
am: 9d2914436f

Change-Id: Ifccf901c30a7b4cbb8fb0556b0ed520ddc1851c8

commit | commitdiff | tree

Fyodor Kupolov [Thu, 9 Mar 2017 20:18:55 +0000 (20:18 +0000)]

[DO NOT MERGE] Check bounds in offsetToPtr am: 7b83d625aa am: 2d54d2c0d5 am: 305a41b7a6 -s ours am: e0f30ecdb9 -s ours am: a482ac81a5
am: b50794ec65 -s ours

Change-Id: If7f57fc24bc60e8fa990e43fed483576d5451282

commit | commitdiff | tree

Fyodor Kupolov [Thu, 9 Mar 2017 20:12:46 +0000 (20:12 +0000)]

[DO NOT MERGE] Check bounds in offsetToPtr am: 7b83d625aa am: 2d54d2c0d5 am: 305a41b7a6 -s ours am: e0f30ecdb9 -s ours
am: a482ac81a5

Change-Id: I4f7b8442c5094c30496299cf00b744db48fd72ad

commit | commitdiff | tree

Fyodor Kupolov [Thu, 9 Mar 2017 20:07:54 +0000 (20:07 +0000)]

[DO NOT MERGE] Check bounds in offsetToPtr am: bb6096d37b -s ours am: 31b54b9803 am: 56020da601 -s ours
am: 29104fe5eb

Change-Id: I8cc18e571f1791845aa2add426fa93a9f7520de7

commit | commitdiff | tree

Fyodor Kupolov [Thu, 9 Mar 2017 20:05:21 +0000 (20:05 +0000)]

[DO NOT MERGE] Check bounds in offsetToPtr am: 7b83d625aa am: 2d54d2c0d5 am: 305a41b7a6 -s ours
am: e0f30ecdb9 -s ours

Change-Id: Iffa0c61e06cbfe2e66912c26b0a3d81660bc5a91

commit | commitdiff | tree

Fyodor Kupolov [Thu, 9 Mar 2017 20:01:05 +0000 (20:01 +0000)]

[DO NOT MERGE] Check bounds in offsetToPtr am: 1cbfeef9d8 am: cd1be81d25 -s ours
am: 451bcb50c7

Change-Id: Iecaf28d9d8df6d202f67a6393f1255d65c24dd64

commit | commitdiff | tree

Fyodor Kupolov [Thu, 9 Mar 2017 19:58:28 +0000 (19:58 +0000)]

[DO NOT MERGE] Check bounds in offsetToPtr am: bb6096d37b -s ours am: 31b54b9803
am: 56020da601 -s ours

Change-Id: I1117f04043a04adce2fc544052884e96430cc88a

commit | commitdiff | tree

Fyodor Kupolov [Thu, 9 Mar 2017 19:58:26 +0000 (19:58 +0000)]

[DO NOT MERGE] Check bounds in offsetToPtr am: 7b83d625aa am: 2d54d2c0d5
am: 305a41b7a6 -s ours

Change-Id: I902e6af1c2ef49d454a7d1bae92d8e20ea263b0e

commit | commitdiff | tree

Fyodor Kupolov [Thu, 9 Mar 2017 19:52:01 +0000 (19:52 +0000)]

[DO NOT MERGE] Check bounds in offsetToPtr am: 7b83d625aa
am: 2d54d2c0d5

Change-Id: I29dccd1ed95079470fc1dd7b04e3db6c5c7d76d2

commit | commitdiff | tree

Fyodor Kupolov [Thu, 9 Mar 2017 19:51:55 +0000 (19:51 +0000)]

[DO NOT MERGE] Check bounds in offsetToPtr am: 1cbfeef9d8
am: cd1be81d25 -s ours

Change-Id: Idce25609138797d130d511ea84847ed71fc6dd65

commit | commitdiff | tree

Fyodor Kupolov [Thu, 9 Mar 2017 19:50:39 +0000 (19:50 +0000)]

[DO NOT MERGE] Check bounds in offsetToPtr am: bb6096d37b -s ours
am: 31b54b9803

Change-Id: Idfb4997bc0e44322bcf2db7e111b76ea59244168

commit | commitdiff | tree

Fyodor Kupolov [Thu, 9 Mar 2017 19:44:01 +0000 (19:44 +0000)]

[DO NOT MERGE] Check bounds in offsetToPtr
am: 1cbfeef9d8

Change-Id: Ib2dc9c376b0ad77a0b64ac3a762bc49e4ef6159f

commit | commitdiff | tree

Fyodor Kupolov [Thu, 9 Mar 2017 19:43:55 +0000 (19:43 +0000)]

Merge "[DO NOT MERGE] Check bounds in offsetToPtr" into mnc-dev
am: 07beec953b

Change-Id: Ia5853c9741163b5e38a432ca645e4082bfa0a7bb

commit | commitdiff | tree

Fyodor Kupolov [Thu, 9 Mar 2017 19:43:54 +0000 (19:43 +0000)]

[DO NOT MERGE] Check bounds in offsetToPtr
am: 7b83d625aa

Change-Id: Icfcec14e7d4bfcd6c893f0fa319541223b9d7901

commit | commitdiff | tree

Fyodor Kupolov [Thu, 9 Mar 2017 19:43:52 +0000 (19:43 +0000)]

[DO NOT MERGE] Check bounds in offsetToPtr
am: bb6096d37b -s ours

Change-Id: Ief3269100fb5c0d425e58b4faf87bd73677251b1

commit | commitdiff | tree

Fyodor Kupolov [Thu, 9 Mar 2017 19:35:27 +0000 (19:35 +0000)]

Merge "[DO NOT MERGE] Check bounds in offsetToPtr" into mnc-dev

commit | commitdiff | tree

Svetoslav Ganov [Thu, 9 Mar 2017 19:26:50 +0000 (19:26 +0000)]

Merge "[DO NOT MERGE] Don't allow permission change to runtime" into mnc-dev
am: c8dac8d6f6

Change-Id: I597b43bb7218779d55c0b11af79daef128d199f2

commit | commitdiff | tree

TreeHugger Robot [Thu, 9 Mar 2017 19:19:39 +0000 (19:19 +0000)]

Merge "[DO NOT MERGE] Don't allow permission change to runtime" into mnc-dev

commit | commitdiff | tree

Svetoslav Ganov [Thu, 29 Dec 2016 22:40:11 +0000 (14:40 -0800)]

[DO NOT MERGE] Don't allow permission change to runtime

Prevent apps to change permission protection level to dangerous
from any other type as this would allow a privilege escalation
where an app adds a normal permission in other app's group and
then redefines it as dangerous leading to the group auto-grant.

Test: Added a CTS test which passes.

Bug: 33860747

Change-Id: I4e86ee54e61d2fa45be601fae577986ef9a84673

commit | commitdiff | tree

Fyodor Kupolov [Wed, 22 Feb 2017 22:12:50 +0000 (14:12 -0800)]

[DO NOT MERGE] Throw exception if slot has invalid offset

Previously the process would crash, which is OK, but complicates testing.

Test: cts-tradefed run cts --module CtsContentTestCases
--test android.content.cts.ContentProviderCursorWindowTest
Bug: 34128677

Change-Id: I5b50982d77ec65c442fbb973d14c85a5c29c43c7
(cherry picked from commit eb6de6f5f10148b9f81f9c0074d1e1f7af21bfb0)

commit | commitdiff | tree

Fyodor Kupolov [Wed, 22 Feb 2017 22:12:50 +0000 (14:12 -0800)]

[DO NOT MERGE] Throw exception if slot has invalid offset

Previously the process would crash, which is OK, but complicates testing.

Test: cts-tradefed run cts --module CtsContentTestCases
--test android.content.cts.ContentProviderCursorWindowTest
Bug: 34128677

Change-Id: I5b50982d77ec65c442fbb973d14c85a5c29c43c7
(cherry picked from commit eb6de6f5f10148b9f81f9c0074d1e1f7af21bfb0)

commit | commitdiff | tree

Fyodor Kupolov [Wed, 22 Feb 2017 22:12:50 +0000 (14:12 -0800)]

[DO NOT MERGE] Throw exception if slot has invalid offset

Previously the process would crash, which is OK, but complicates testing.

Test: cts-tradefed run cts --module CtsContentTestCases
--test android.content.cts.ContentProviderCursorWindowTest
Bug: 34128677

Change-Id: I5b50982d77ec65c442fbb973d14c85a5c29c43c7
(cherry picked from commit eb6de6f5f10148b9f81f9c0074d1e1f7af21bfb0)

commit | commitdiff | tree

Fyodor Kupolov [Wed, 22 Feb 2017 22:12:50 +0000 (14:12 -0800)]

[DO NOT MERGE] Throw exception if slot has invalid offset

Previously the process would crash, which is OK, but complicates testing.

Test: cts-tradefed run cts --module CtsContentTestCases
--test android.content.cts.ContentProviderCursorWindowTest
Bug: 34128677

Change-Id: I5b50982d77ec65c442fbb973d14c85a5c29c43c7
(cherry picked from commit eb6de6f5f10148b9f81f9c0074d1e1f7af21bfb0)

commit | commitdiff | tree

Fyodor Kupolov [Tue, 28 Feb 2017 01:33:18 +0000 (17:33 -0800)]

[DO NOT MERGE] Check bounds in offsetToPtr

Check whether specified offset belongs to mData.
Also added a default argument bufferSize to check the end offset.

Size of the ashmem descriptor can be modified between
ashmem_get_size_region call and mmap. createFromParcel method was updated
to check ashmem size again immediately after memory is mapped.

Test: manual - using the test app from the bug
Bug: 34128677
Change-Id: I3ecd1616a870ce20941ce9b20a1843d2b4295750
(cherry picked from commit 45e2e95c2ffeb2d978e2cce80b729ef6ada3b8d2)

commit | commitdiff | tree

Fyodor Kupolov [Tue, 28 Feb 2017 01:33:18 +0000 (17:33 -0800)]

[DO NOT MERGE] Check bounds in offsetToPtr

Check whether specified offset belongs to mData.
Also added a default argument bufferSize to check the end offset.

Size of the ashmem descriptor can be modified between
ashmem_get_size_region call and mmap. createFromParcel method was updated
to check ashmem size again immediately after memory is mapped.

Test: manual - using the test app from the bug
Bug: 34128677
Change-Id: I3ecd1616a870ce20941ce9b20a1843d2b4295750
(cherry picked from commit 45e2e95c2ffeb2d978e2cce80b729ef6ada3b8d2)

commit | commitdiff | tree

Fyodor Kupolov [Tue, 28 Feb 2017 01:33:18 +0000 (17:33 -0800)]

[DO NOT MERGE] Check bounds in offsetToPtr

Check whether specified offset belongs to mData.
Also added a default argument bufferSize to check the end offset.

Size of the ashmem descriptor can be modified between
ashmem_get_size_region call and mmap. createFromParcel method was updated
to check ashmem size again immediately after memory is mapped.

Test: manual - using the test app from the bug
Bug: 34128677
Change-Id: I3ecd1616a870ce20941ce9b20a1843d2b4295750
(cherry picked from commit 45e2e95c2ffeb2d978e2cce80b729ef6ada3b8d2)

commit | commitdiff | tree

Fyodor Kupolov [Tue, 28 Feb 2017 01:33:18 +0000 (17:33 -0800)]

[DO NOT MERGE] Check bounds in offsetToPtr

Check whether specified offset belongs to mData.
Also added a default argument bufferSize to check the end offset.

Size of the ashmem descriptor can be modified between
ashmem_get_size_region call and mmap. createFromParcel method was updated
to check ashmem size again immediately after memory is mapped.

Test: manual - using the test app from the bug
Bug: 34128677
Change-Id: I3ecd1616a870ce20941ce9b20a1843d2b4295750
(cherry picked from commit 45e2e95c2ffeb2d978e2cce80b729ef6ada3b8d2)

commit | commitdiff | tree

Jeff Sharkey [Sun, 12 Feb 2017 09:58:13 +0000 (09:58 +0000)]

DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 6f754e48e9 am: a0b1198e70 -s ours
am: 48f1ddc94a

Change-Id: I1785a0a301e2847946276be682f62ee263b39a3f

commit | commitdiff | tree

Jeff Sharkey [Sun, 12 Feb 2017 09:53:38 +0000 (09:53 +0000)]

DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 6f754e48e9
am: a0b1198e70 -s ours

Change-Id: Ieefebd7669b892cba9afade572e3f43d56095902

commit | commitdiff | tree

Jeff Sharkey [Sun, 12 Feb 2017 09:48:46 +0000 (09:48 +0000)]

DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
am: 6f754e48e9

Change-Id: I2f6dd5ba1e266b3d451533e518ec7f2fe24b262c

commit | commitdiff | tree

Jeff Sharkey [Sun, 12 Feb 2017 09:47:33 +0000 (09:47 +0000)]

DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
am: 3f3da42ef9

Change-Id: I222c32931827d906db5fc1e3258f2095e6013481

commit | commitdiff | tree

Jeff Sharkey [Wed, 30 Nov 2016 21:29:59 +0000 (14:29 -0700)]

DO NOT MERGE. Grant MMS Uri permissions as the calling UID.

A recent security fix prevents the system UID from handing out Uri
permission grants directly from itself. Instead, services need to
issue grants as the original calling UID to ensure that the caller
actually has access to the Uris.

Test: builds, boots, send/recv MMS works in primary/secondary users
Bug: 33231106
Change-Id: Ia9fe19843b52977c8a94ee5349b907beda1882fc
(cherry picked from commit 7ff418d9a9afb9ecf42f87fffd3e65477decb55e)

commit | commitdiff | tree

Jeff Sharkey [Wed, 30 Nov 2016 21:29:59 +0000 (14:29 -0700)]

DO NOT MERGE. Grant MMS Uri permissions as the calling UID.

A recent security fix prevents the system UID from handing out Uri
permission grants directly from itself. Instead, services need to
issue grants as the original calling UID to ensure that the caller
actually has access to the Uris.

Test: builds, boots, send/recv MMS works in primary/secondary users
Bug: 33231106
Change-Id: Ia9fe19843b52977c8a94ee5349b907beda1882fc
(cherry picked from commit 7ff418d9a9afb9ecf42f87fffd3e65477decb55e)

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:35:19 +0000 (00:35 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f -s ours am: b058dc139d am: d20b04a41d -s ours
am: 4b0164b27c

Change-Id: I4dda89507d1003f82af6e204c9983732b36927da

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:34:33 +0000 (00:34 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0 -s ours am: 4a4b6bfafb am: 61e9179646 -s ours
am: 9346bec730

Change-Id: I456a98abbdcb7d6f7d959a791da726f56f55edf8

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:33:40 +0000 (00:33 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5 -s ours
am: f82c373074

Change-Id: I603a9a75c3874f1b7cf099aa26b865fdbe7b0e99

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:32:49 +0000 (00:32 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8 -s ours
am: 05749525a5

Change-Id: Id298d130a52b44ad9252f8a65c88bb63fbb86f7f

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:30:04 +0000 (00:30 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f -s ours am: b058dc139d
am: d20b04a41d -s ours

Change-Id: I2a98850d4c3246c02d5197adff9503be2839df01

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:29:13 +0000 (00:29 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0 -s ours am: 4a4b6bfafb
am: 61e9179646 -s ours

Change-Id: Ibfdb4128b1db25db478f9b4cb987d0754ddd9124

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:23:24 +0000 (00:23 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530
am: 5d65931af5 -s ours

Change-Id: I14933edb3f93eea4156698bb2669938849c30697

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:22:28 +0000 (00:22 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73
am: 73f95823f8 -s ours

Change-Id: I1361483ca420b86bf1adedfe297d4dcdf5121a18

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:22:15 +0000 (00:22 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f -s ours
am: b058dc139d

Change-Id: Idd1aeb4749741aa8bae76cf43ce3f2bdceff077d

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:21:13 +0000 (00:21 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0 -s ours
am: 4a4b6bfafb

Change-Id: Id479b2d27fd8396047312fe7259971c167b8d705

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:12:45 +0000 (00:12 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev
am: e6be8d765f

Change-Id: I502a04687a3a7840860e1a3af0a702f7162a8897

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:12:43 +0000 (00:12 +0000)]

DO NOT MERGE. No direct Uri grants from system.
am: bac46f5b65

Change-Id: I87dbe96e14c68b5d99b43bf7ad3d653d5fb33a61

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:12:10 +0000 (00:12 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev
am: 6d3573e530

Change-Id: I501ff6230b9b5fa5d7232e52cfe326320c7edf65

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:12:08 +0000 (00:12 +0000)]

DO NOT MERGE. No direct Uri grants from system.
am: 6f13f73b73

Change-Id: I28627832c3ec765d6761afbf3fc508d1069c9582

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:10:17 +0000 (00:10 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev
am: 3e4faac39f -s ours

Change-Id: If1ea6da6679874ca13379222a28c529421c80b23

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:10:16 +0000 (00:10 +0000)]

DO NOT MERGE. No direct Uri grants from system.
am: 2dfdf662d0 -s ours

Change-Id: Id06fac9dd096c1d821a1af7451db388446e9b156

commit | commitdiff | tree

Jeff Sharkey [Thu, 2 Feb 2017 23:59:43 +0000 (23:59 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev

commit | commitdiff | tree

Jeff Sharkey [Thu, 2 Feb 2017 23:59:42 +0000 (23:59 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev

commit | commitdiff | tree

Jeff Sharkey [Thu, 2 Feb 2017 23:59:40 +0000 (23:59 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev

commit | commitdiff | tree

Jeff Sharkey [Thu, 2 Feb 2017 23:59:39 +0000 (23:59 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:24:38 +0000 (23:24 +0000)]

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef36 -s ours am: d9c8155943 -s ours am: bf1c88f34e -s ours
am: c1a0e6db4c -s ours

Change-Id: Ide2acd4e61618be87ad4c32d735a4cd7f3781d0b

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:21:37 +0000 (23:21 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours am: 051f01700e -s ours am: a3685e4bb5 -s ours
am: 3f7ed73fdd -s ours

Change-Id: I42ed0e37dc68919a2a3e6b9b6aaa5030a90eca77

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:18:07 +0000 (23:18 +0000)]

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef36 -s ours am: d9c8155943 -s ours
am: bf1c88f34e -s ours

Change-Id: I75d702680bc6ef22e0f60a3c165cd310bf2bb6cf

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:17:06 +0000 (23:17 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours am: 051f01700e -s ours
am: a3685e4bb5 -s ours

Change-Id: If22ee3dec4879f8324a66dea910bb65c9f6eda14

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:13:03 +0000 (23:13 +0000)]

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef36 -s ours
am: d9c8155943 -s ours

Change-Id: I9dfff7471440739580e7827cdb4484fad6900048

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:12:05 +0000 (23:12 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours
am: 051f01700e -s ours

Change-Id: Idcf3ce991369a6e41a3c2bd3aa9cd16d909eea13

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:07:36 +0000 (23:07 +0000)]

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev
am: af85feef36 -s ours

Change-Id: Idf57ddf932e98dda06ac9c51f7e230d6a673882b

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:07:34 +0000 (23:07 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held
am: 14ed611912 -s ours

Change-Id: I1645d15febdfffd76cd2c592241549c507db1185

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:00:07 +0000 (23:00 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b am: b278ed787e -s ours am: ec3e2b9dcb -s ours am: 483b561f41 am: 6e850f85fc -s ours
am: bdeae85e54

Change-Id: I112366734c02695d69251e159fb97c523a9c0cf4

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 22:58:45 +0000 (22:58 +0000)]

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 22:56:23 +0000 (22:56 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b am: b278ed787e -s ours am: ec3e2b9dcb -s ours am: 483b561f41
am: 6e850f85fc -s ours

Change-Id: I1cfa1298cf0a1f4f53358242d639ff7f072bc273

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 22:50:32 +0000 (22:50 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b am: b278ed787e -s ours am: ec3e2b9dcb -s ours
am: 483b561f41

Change-Id: I065ff3640f19985157cd63c529019167c135489a

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 22:45:36 +0000 (22:45 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b am: b278ed787e -s ours
am: ec3e2b9dcb -s ours

Change-Id: I76bf4d69d98374a90da3cd4c74f0c2d892504a40

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 22:41:38 +0000 (22:41 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b
am: b278ed787e -s ours

Change-Id: Ib70440bdd1c60ed5eaa9b8c8152a4745f44cacd6

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 22:39:22 +0000 (22:39 +0000)]

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev am: 3ced78bdda am: aec526f710 -s ours
am: 14e38a8b21

Change-Id: Ib5e1e997168d33810e36510bebe6783382211059

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 22:38:31 +0000 (22:38 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d15d1 -s ours
am: 3a09dac9c4

Change-Id: I7c001da58aee7ea4784a8fb8c8a2a2498bfba533

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 22:36:03 +0000 (22:36 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a
am: 21992d997b

Change-Id: Ib5ba5eb63227be2fbf25a79e7f8f8e42b1cc9a2b

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 22:34:55 +0000 (22:34 +0000)]

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev am: 3ced78bdda
am: aec526f710 -s ours

Change-Id: I383f706dfc0690352c3b4d6358ed1269c15ed8b8

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 22:34:02 +0000 (22:34 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69
am: c22e6d15d1 -s ours

Change-Id: I80fa5e3991464bf99111c00b1074a4e5c7ef9130

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 22:31:29 +0000 (22:31 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held
am: 8cdc04957a

Change-Id: I7c1b9e9f785ef99575136d9af0b062dad759c17a

commit | commitdiff | tree

Jack Yu [Thu, 2 Feb 2017 22:31:29 +0000 (22:31 +0000)]

Fixed the logic for tethering provisioning re-evaluation am: 91a0bc9564 am: 40d0753b10
am: 413922e746

Change-Id: I8664d6e42113b4c22741b06780727b10c2e6804e

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 22:29:02 +0000 (22:29 +0000)]

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev
am: 3ced78bdda

Change-Id: I4da6e2894de769fb028ad713290b62e38925294a

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 22:28:59 +0000 (22:28 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held
am: 835c8b3d69

Change-Id: I080d11d3d7d6434b832f8ecb1ee93c17a6d7cb4a

commit | commitdiff | tree

Jack Yu [Thu, 2 Feb 2017 22:26:09 +0000 (22:26 +0000)]

Fixed the logic for tethering provisioning re-evaluation am: 91a0bc9564
am: 40d0753b10

Change-Id: I1f8a897862c69a475c6d12a824bd69ed8692cd99

frameworks/base

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.