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

Jeff Sharkey [Thu, 6 Jul 2017 17:29:06 +0000 (11:29 -0600)]

Change storage migration to use quota APIs.

New quota APIs are much faster than trying to measure manually, and
removing this last user of calculateDirectorySize() means we can
remove it once and for all.

Bug: 36056324
Test: builds, boots
Change-Id: Ibdf1ee4e8885680e106df6a9269b6309ddc61af8

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 14:46:19 +0000 (14:46 +0000)]

Merge "Merge "Fixed an issue where the lockscreen could be all white" into oc-dr1-dev am: f96da7ee6f am: ab95597f85"

commit | commitdiff | tree

Selim Cinek [Thu, 6 Jul 2017 14:45:19 +0000 (14:45 +0000)]

Merge "Fixed an issue where the lockscreen could be all white" into oc-dr1-dev am: f96da7ee6f
am: ab95597f85

Change-Id: I09a8181bcddc14462cb0756fcc4977636b7d4698

commit | commitdiff | tree

Selim Cinek [Thu, 6 Jul 2017 14:43:59 +0000 (14:43 +0000)]

Merge "Fixed an issue where the lockscreen could be all white" into oc-dr1-dev am: f96da7ee6f
am: ab95597f85

Change-Id: I2a2c3731c2494a7059c8795148920a42dc978025

commit | commitdiff | tree

Selim Cinek [Thu, 6 Jul 2017 14:38:24 +0000 (14:38 +0000)]

Merge "Fixed an issue where the lockscreen could be all white" into oc-dr1-dev
am: f96da7ee6f

Change-Id: I73e4bc5115959ae38052be25effa736576eb0ba9

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Jul 2017 14:32:53 +0000 (14:32 +0000)]

Merge "Fixed an issue where the lockscreen could be all white" into oc-dr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 13:29:46 +0000 (13:29 +0000)]

Merge "Merge "Merge "Fix some config issues with sysui" into oc-dr1-dev am: f636e3fb52" into oc-dr1-dev-plus-aosp am: 30cf9cb2b3"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 13:28:57 +0000 (13:28 +0000)]

Merge "Merge "Merge "Fix some config issues with sysui" into oc-dr1-dev am: f636e3fb52" into oc-dr1-dev-plus-aosp am: 30cf9cb2b3"

commit | commitdiff | tree

Jason Monk [Thu, 6 Jul 2017 13:28:38 +0000 (13:28 +0000)]

Merge "Merge "Fix some config issues with sysui" into oc-dr1-dev am: f636e3fb52" into oc-dr1-dev-plus-aosp
am: 30cf9cb2b3

Change-Id: I9548ebf370a868a18ceb4f91c8b581fc8f3df0fa

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Jul 2017 13:28:18 +0000 (13:28 +0000)]

Merge "Zygote: Improve logging and error handling during connections."

commit | commitdiff | tree

Jason Monk [Thu, 6 Jul 2017 13:28:00 +0000 (13:28 +0000)]

Merge "Merge "Fix some config issues with sysui" into oc-dr1-dev am: f636e3fb52" into oc-dr1-dev-plus-aosp
am: 30cf9cb2b3

Change-Id: If4ca1d8d4ab5ba052ade74feea252cafcab7fcea

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 13:27:59 +0000 (13:27 +0000)]

Merge "Merge "Fix some config issues with sysui" into oc-dr1-dev am: f636e3fb52 am: f6219fa804"

commit | commitdiff | tree

Jason Monk [Thu, 6 Jul 2017 13:26:55 +0000 (13:26 +0000)]

Merge "Fix some config issues with sysui" into oc-dr1-dev am: f636e3fb52
am: f6219fa804

Change-Id: I85dd1243913d6156a6aed0780335f14ede912582

commit | commitdiff | tree

Jason Monk [Thu, 6 Jul 2017 13:26:14 +0000 (13:26 +0000)]

Merge "Fix some config issues with sysui" into oc-dr1-dev am: f636e3fb52
am: f6219fa804

Change-Id: I664f79cf1b63edb083773b3cd283fec4d0a5e9bb

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 13:23:19 +0000 (13:23 +0000)]

Merge "Merge "Fix some config issues with sysui" into oc-dr1-dev am: f636e3fb52" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Jason Monk [Thu, 6 Jul 2017 13:21:37 +0000 (13:21 +0000)]

Merge "Fix some config issues with sysui" into oc-dr1-dev
am: f636e3fb52

Change-Id: Iac9ad5693df97185575e4d620aebf00fd19870fa

commit | commitdiff | tree

Jason Monk [Thu, 6 Jul 2017 13:20:18 +0000 (13:20 +0000)]

Merge "Fix some config issues with sysui" into oc-dr1-dev
am: f636e3fb52

Change-Id: Ib9b38c8eb8c6452e7d12f2ced2b499292c000277

commit | commitdiff | tree

Jason Monk [Thu, 6 Jul 2017 13:13:55 +0000 (13:13 +0000)]

Merge "Fix some config issues with sysui" into oc-dr1-dev

commit | commitdiff | tree

Narayan Kamath [Wed, 5 Jul 2017 13:45:38 +0000 (14:45 +0100)]

Zygote: Improve logging and error handling during connections.

Before this change, we were throwing a checked exception on success
and returning on failure. This made it hard to figure out where / when
something was going wrong. This change switches things around to throw
a RuntimeException when something goes wrong and to return a Runnable
on success. This lets us make stronger assertions in both the parent
and the child process about their state and expected return values.

This change also upgrades the severity of several errors that we would
earlier just ignore. We will now reject the command and terminate the
connection to the client when we encounter these errors such as:

- Malformed arguments
- Any ZygoteSecurityException, such as thown thrown by
applyUidSecurityPolicy and applyInvokeWithSecurityPolicy.
- Any error in setting up pipes etc. to facilitate communication
with child processes.

Bug: 13618569
Test: Manual
Change-Id: Id931d44135ae2e4ede1bbac6a4b187f6c139e1fd

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 11:48:09 +0000 (11:48 +0000)]

Merge "Merge "Merge "Zygote: Fix race condition on package preloads." into oc-dr1-dev am: 84e0f453d1" into oc-dr1-dev-plus-aosp am: c4b8015b1a"

commit | commitdiff | tree

Narayan Kamath [Thu, 6 Jul 2017 11:47:01 +0000 (11:47 +0000)]

Merge "Merge "Zygote: Fix race condition on package preloads." into oc-dr1-dev am: 84e0f453d1" into oc-dr1-dev-plus-aosp
am: c4b8015b1a

Change-Id: Ieb2aeef9f1f0fc4d3ce519d6298200e43932bb62

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 11:46:23 +0000 (11:46 +0000)]

Merge "Merge "Zygote: Fix race condition on package preloads." into oc-dr1-dev am: 84e0f453d1 am: ac27936be5"

commit | commitdiff | tree

Narayan Kamath [Thu, 6 Jul 2017 11:44:40 +0000 (11:44 +0000)]

Merge "Zygote: Fix race condition on package preloads." into oc-dr1-dev am: 84e0f453d1
am: ac27936be5

Change-Id: I7a119096e7bf5079c14893956ac22a9afa981508

commit | commitdiff | tree

Narayan Kamath [Thu, 6 Jul 2017 11:44:23 +0000 (11:44 +0000)]

Merge "Merge "Zygote: Fix race condition on package preloads." into oc-dr1-dev am: 84e0f453d1" into oc-dr1-dev-plus-aosp
am: c4b8015b1a

Change-Id: Idfc84d0c08958afdd9f7c345651164f32f523df5

commit | commitdiff | tree

Narayan Kamath [Thu, 6 Jul 2017 11:42:20 +0000 (11:42 +0000)]

Merge "Zygote: Fix race condition on package preloads." into oc-dr1-dev am: 84e0f453d1
am: ac27936be5

Change-Id: I5ba16c4dc50fbf508830028a1bbac24e73b7ccb6

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 11:37:57 +0000 (11:37 +0000)]

Merge "Merge "Zygote: Fix race condition on package preloads." into oc-dr1-dev am: 84e0f453d1" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Narayan Kamath [Thu, 6 Jul 2017 11:36:48 +0000 (11:36 +0000)]

Merge "Zygote: Fix race condition on package preloads." into oc-dr1-dev
am: 84e0f453d1

Change-Id: I17a572fa28c1371ef51753ff236f569a018df063

commit | commitdiff | tree

Narayan Kamath [Thu, 6 Jul 2017 11:36:41 +0000 (11:36 +0000)]

Merge "Zygote: Fix race condition on package preloads." into oc-dr1-dev
am: 84e0f453d1

Change-Id: I34dc28cd87e5111fccff05893ddf5c1155ad8746

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Jul 2017 11:30:03 +0000 (11:30 +0000)]

Merge "Zygote: Fix race condition on package preloads." into oc-dr1-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Jul 2017 09:50:10 +0000 (09:50 +0000)]

Merge "Zygote: Fix race condition on package preloads."

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Jul 2017 08:51:06 +0000 (08:51 +0000)]

Merge "Place non-mobile tethering upstream types first"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 08:50:31 +0000 (08:50 +0000)]

Merge "Merge "Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19" into stage-aosp-master am: 311b2a31fa" into oc-dev-plus-aosp am: d29b77a59e -s ours" into oc-dr1-dev-plus-aosp am: 8e866fb6bb -s ours"

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 08:48:50 +0000 (08:48 +0000)]

Merge "Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19" into stage-aosp-master am: 311b2a31fa" into oc-dev-plus-aosp am: d29b77a59e -s ours" into oc-dr1-dev-plus-aosp
am: 8e866fb6bb -s ours

Change-Id: I4f632bd8257ab5af21c497347535b6d3cb0307ff

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 08:47:43 +0000 (08:47 +0000)]

Merge "Merge "Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19" into stage-aosp-master am: 311b2a31fa" into oc-dev-plus-aosp am: d29b77a59e -s ours" into oc-dr1-dev-plus-aosp am: b3c41d55d5 -s ours"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 08:46:34 +0000 (08:46 +0000)]

Merge "Merge "Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19" into stage-aosp-master am: 311b2a31fa" into oc-dev-plus-aosp am: d29b77a59e -s ours" into oc-dr1-dev-plus-aosp am: b3c41d55d5 -s ours"

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 08:45:58 +0000 (08:45 +0000)]

Merge "Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19" into stage-aosp-master am: 311b2a31fa" into oc-dev-plus-aosp am: d29b77a59e -s ours" into oc-dr1-dev-plus-aosp
am: b3c41d55d5 -s ours

Change-Id: I50f02273063c3c0371e71a4f2e9b3ec10251e7c8

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 08:44:04 +0000 (08:44 +0000)]

Merge "Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19" into stage-aosp-master am: 311b2a31fa" into oc-dev-plus-aosp am: d29b77a59e -s ours" into oc-dr1-dev-plus-aosp
am: b3c41d55d5 -s ours

Change-Id: I50ef47618b4bf6b277eb02c331318594647ba5e9

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 08:42:58 +0000 (08:42 +0000)]

Merge "Merge "Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19" into stage-aosp-master am: 311b2a31fa" into oc-dev-plus-aosp am: 4568cf1c82 -s ours" into oc-dr1-dev-plus-aosp am: d361ca378b -s ours"

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 08:40:25 +0000 (08:40 +0000)]

Merge "Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19" into stage-aosp-master am: 311b2a31fa" into oc-dev-plus-aosp am: 4568cf1c82 -s ours" into oc-dr1-dev-plus-aosp
am: d361ca378b -s ours

Change-Id: I40c5fe8bf8fc12e656f3d1f6b0b5b2bea9ab54ae

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 08:40:02 +0000 (08:40 +0000)]

Merge "Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19 am: aa9d12fa56" into oc-dev-plus-aosp am: 94a7d5bfcf -s ours" into oc-dr1-dev-plus-aosp am: 9643e138ee -s ours"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 08:39:16 +0000 (08:39 +0000)]

Merge "Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19 am: aa9d12fa56" into oc-dev-plus-aosp am: 94a7d5bfcf -s ours" into oc-dr1-dev-plus-aosp am: 3607b61d8e -s ours"

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 08:38:03 +0000 (08:38 +0000)]

Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19 am: aa9d12fa56" into oc-dev-plus-aosp am: 94a7d5bfcf -s ours" into oc-dr1-dev-plus-aosp
am: 9643e138ee -s ours

Change-Id: Ifa925726c9f856464393cd4d3e44737b45cef99c

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 08:37:30 +0000 (08:37 +0000)]

Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19 am: aa9d12fa56" into oc-dev-plus-aosp am: 94a7d5bfcf -s ours" into oc-dr1-dev-plus-aosp
am: 3607b61d8e -s ours

Change-Id: Ie56d9c2b907ebe900091f689ba7cdd2271a687cc

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 08:37:22 +0000 (08:37 +0000)]

Merge "Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19 am: aa9d12fa56" into oc-dev-plus-aosp am: 94a7d5bfcf -s ours" into oc-dr1-dev-plus-aosp am: 3607b61d8e -s ours"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 08:36:39 +0000 (08:36 +0000)]

Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19 am: aa9d12fa56 am: 462232a92f -s ours" into oc-dr1-dev-plus-aosp am: 3f9a7e9e9c -s ours"

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 08:35:34 +0000 (08:35 +0000)]

Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19 am: aa9d12fa56" into oc-dev-plus-aosp am: 94a7d5bfcf -s ours" into oc-dr1-dev-plus-aosp
am: 3607b61d8e -s ours

Change-Id: Id08939b55fb2d435565aac1ea1c1869c3a669886

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 08:34:46 +0000 (08:34 +0000)]

Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19 am: aa9d12fa56 am: 462232a92f -s ours" into oc-dr1-dev-plus-aosp
am: 3f9a7e9e9c -s ours

Change-Id: I45d71fe508c36a525fc63be4dd20fbba44daf3c4

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 08:33:20 +0000 (08:33 +0000)]

Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19 am: aa9d12fa56 am: 462232a92f -s ours" into oc-dr1-dev-plus-aosp
am: 3f9a7e9e9c -s ours

Change-Id: I397d10ce47bd115f0724a46e82c905abe4e6442c

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 08:31:32 +0000 (08:31 +0000)]

Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19 am: aa9d12fa56 am: 462232a92f -s ours
am: 9c0d57d8f5 -s ours

Change-Id: Icad179164e747d803356a85da50ee8af14ee4d57

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 08:30:45 +0000 (08:30 +0000)]

Merge "Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19" into stage-aosp-master am: 311b2a31fa" into oc-dev-plus-aosp am: d29b77a59e -s ours" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 08:28:54 +0000 (08:28 +0000)]

Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19" into stage-aosp-master am: 311b2a31fa" into oc-dev-plus-aosp
am: d29b77a59e -s ours

Change-Id: Ie78baf6e151ea2504a71403e18b0bc148720cf7d

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 08:28:13 +0000 (08:28 +0000)]

Merge "Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19" into stage-aosp-master am: 311b2a31fa" into oc-dev-plus-aosp am: d29b77a59e -s ours" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 08:25:13 +0000 (08:25 +0000)]

Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19" into stage-aosp-master am: 311b2a31fa" into oc-dev-plus-aosp
am: d29b77a59e -s ours

Change-Id: Ie604bafda0f2259c6f2a9a6c4fe3964e9ba01384

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 08:24:27 +0000 (08:24 +0000)]

Merge "Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19" into stage-aosp-master am: 311b2a31fa" into oc-dev-plus-aosp am: 4568cf1c82 -s ours" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 08:22:45 +0000 (08:22 +0000)]

Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19 am: aa9d12fa56" into oc-dev-plus-aosp am: 94a7d5bfcf -s ours" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 08:22:32 +0000 (08:22 +0000)]

Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19" into stage-aosp-master am: 311b2a31fa" into oc-dev-plus-aosp
am: 4568cf1c82 -s ours

Change-Id: I1ea2c650ed2a45265caa440c1d82efd724b57a15

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 08:21:28 +0000 (08:21 +0000)]

Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19 am: aa9d12fa56" into oc-dev-plus-aosp am: 94a7d5bfcf -s ours" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 08:21:03 +0000 (08:21 +0000)]

Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19 am: aa9d12fa56" into oc-dev-plus-aosp
am: 94a7d5bfcf -s ours

Change-Id: I0388ba2add121b330b8ddf4f75a0d6a04f0c2254

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 08:20:09 +0000 (08:20 +0000)]

Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19 am: aa9d12fa56" into oc-dev-plus-aosp
am: 94a7d5bfcf -s ours

Change-Id: I8cc27f38c1787859ebaae075f40649dbf6169e7e

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 08:20:08 +0000 (08:20 +0000)]

Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19 am: aa9d12fa56 am: 462232a92f -s ours" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 08:19:02 +0000 (08:19 +0000)]

Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19 am: aa9d12fa56
am: 462232a92f -s ours

Change-Id: I29b398c6665083e0807a5ff0f84cb8b074642820

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 08:18:12 +0000 (08:18 +0000)]

Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19 am: aa9d12fa56
am: 462232a92f -s ours

Change-Id: I9945181d664321b968dd6f348699b344f5f73390

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 08:13:28 +0000 (08:13 +0000)]

Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19" into stage-aosp-master am: 311b2a31fa" into oc-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 08:13:00 +0000 (08:13 +0000)]

Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19" into stage-aosp-master am: 311b2a31fa" into oc-dev-plus-aosp

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 08:11:55 +0000 (08:11 +0000)]

Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19" into stage-aosp-master
am: 311b2a31fa

Change-Id: If2fa9371bc286d2115167b8187f641ec9dfb89a9

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 08:11:44 +0000 (08:11 +0000)]

Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19" into stage-aosp-master
am: 311b2a31fa

Change-Id: I462aa9d52205b1dff46b074e5a13945c34e96890

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 08:11:03 +0000 (08:11 +0000)]

Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19 am: aa9d12fa56" into oc-dev-plus-aosp

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 08:10:00 +0000 (08:10 +0000)]

Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19
am: aa9d12fa56

Change-Id: Iae705d2522f1a21e7aa970a4c16efd41943031ab

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 08:09:13 +0000 (08:09 +0000)]

Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19
am: aa9d12fa56

Change-Id: I9097493cec6ac13dc027ee1d2f13bbe52679e674

commit | commitdiff | tree

Paul Duffin [Thu, 6 Jul 2017 08:07:57 +0000 (08:07 +0000)]

Merge "Add repackaged legacy-test and android.test.runner"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 08:04:24 +0000 (08:04 +0000)]

Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19" into stage-aosp-master

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 08:03:19 +0000 (08:03 +0000)]

Merge "Clearly log tether_offload_disabled setting status in start()"
am: b171a46d19

Change-Id: Ic74dcee4e473e4b6498b16affad88706bb4a6b7e

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 08:02:44 +0000 (08:02 +0000)]

Merge "Clearly log tether_offload_disabled setting status in start()"
am: b171a46d19

Change-Id: I999926bf0b67b12caadeea2d3766d8f69913bafe

commit | commitdiff | tree

Treehugger Robot [Thu, 6 Jul 2017 07:54:33 +0000 (07:54 +0000)]

Merge "Clearly log tether_offload_disabled setting status in start()"

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 03:38:48 +0000 (12:38 +0900)]

Clearly log tether_offload_disabled setting status in start()

Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passes
Bug: 29337859
Bug: 32163131

Change-Id: I113358ef71c2e5e3254eb6f9fbf9d5721825b0df
Merged-In: Iebcdb7bfaa85f822e73fe2f3b54caceb5420709c
Merged-In: Ifce832dca7b4d8b3056e2a9e91d38bffe25cfeb6
Merged-In: I99f6abc31579b4b25589452c44e1834a7ba4e591
Merged-In: I312a9309d6934bcec7fc0245cad12b97f1a22521

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 06:40:31 +0000 (06:40 +0000)]

Merge "Merge "Add strings for a "Tethering hardware acceleration" setting." into oc-dr1-dev am: cf694adee3 am: 0c385ebead"

commit | commitdiff | tree

Lorenzo Colitti [Thu, 6 Jul 2017 06:38:46 +0000 (06:38 +0000)]

Merge "Add strings for a "Tethering hardware acceleration" setting." into oc-dr1-dev am: cf694adee3
am: 0c385ebead

Change-Id: Id8f7324edb534dd08cad76bb9dadf64266a2931a

commit | commitdiff | tree

Lorenzo Colitti [Thu, 6 Jul 2017 06:38:01 +0000 (06:38 +0000)]

Merge "Add strings for a "Tethering hardware acceleration" setting." into oc-dr1-dev am: cf694adee3
am: 0c385ebead

Change-Id: I86026edcd7629624ab6fd11643a5fbc10ba6ad86

commit | commitdiff | tree

Lorenzo Colitti [Thu, 6 Jul 2017 06:31:54 +0000 (06:31 +0000)]

Merge "Add strings for a "Tethering hardware acceleration" setting." into oc-dr1-dev
am: cf694adee3

Change-Id: Ie6c5d55ce610a44b627eb8a7c46b897146f0e051

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Jul 2017 06:14:00 +0000 (06:14 +0000)]

Merge "Add strings for a "Tethering hardware acceleration" setting." into oc-dr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 06:05:31 +0000 (06:05 +0000)]

Merge "Merge "Clearly log tether_offload_disabled setting status in start()" into oc-dr1-dev am: f12ff31046 am: 03172fb037"

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 06:03:47 +0000 (06:03 +0000)]

Merge "Clearly log tether_offload_disabled setting status in start()" into oc-dr1-dev am: f12ff31046
am: 03172fb037

Change-Id: Iebcdb7bfaa85f822e73fe2f3b54caceb5420709c

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 06:02:58 +0000 (06:02 +0000)]

Merge "Clearly log tether_offload_disabled setting status in start()" into oc-dr1-dev am: f12ff31046
am: 03172fb037

Change-Id: Ifce832dca7b4d8b3056e2a9e91d38bffe25cfeb6

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 05:56:14 +0000 (05:56 +0000)]

Merge "Clearly log tether_offload_disabled setting status in start()" into oc-dr1-dev
am: f12ff31046

Change-Id: I99f6abc31579b4b25589452c44e1834a7ba4e591

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Jul 2017 05:47:59 +0000 (05:47 +0000)]

Merge "Clearly log tether_offload_disabled setting status in start()" into oc-dr1-dev

commit | commitdiff | tree

Sundeep Ghuman [Thu, 6 Jul 2017 05:35:54 +0000 (05:35 +0000)]

Merge "Merge "Fix NPE on network forget from details page." into oc-dr1-dev am: e59ba746f1" into oc-dr1-dev-plus-aosp
am: 6730551b85

Change-Id: Ie36ff77c2f078bcfbcd0c7a9df4ce5a4776f75bf

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 05:32:47 +0000 (05:32 +0000)]

Merge "Merge "Fix NPE on network forget from details page." into oc-dr1-dev am: e59ba746f1 am: 58b665f4b5"

commit | commitdiff | tree

Sundeep Ghuman [Thu, 6 Jul 2017 05:31:13 +0000 (05:31 +0000)]

Merge "Fix NPE on network forget from details page." into oc-dr1-dev am: e59ba746f1
am: 58b665f4b5

Change-Id: Ic9733769fe3507c9c8409cec28e452d26314bfde

commit | commitdiff | tree

Sundeep Ghuman [Thu, 6 Jul 2017 05:31:03 +0000 (05:31 +0000)]

Merge "Fix NPE on network forget from details page." into oc-dr1-dev am: e59ba746f1
am: 58b665f4b5

Change-Id: I9b7e87ef5f398189666b747471eeee5f197403be

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 05:27:28 +0000 (05:27 +0000)]

Merge "Merge "Fix NPE on network forget from details page." into oc-dr1-dev am: e59ba746f1" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Sundeep Ghuman [Thu, 6 Jul 2017 05:25:45 +0000 (05:25 +0000)]

Merge "Fix NPE on network forget from details page." into oc-dr1-dev
am: e59ba746f1

Change-Id: I419395b77528e5a200411b88940e05af310c37d6

commit | commitdiff | tree

Sundeep Ghuman [Thu, 6 Jul 2017 05:24:56 +0000 (05:24 +0000)]

Merge "Fix NPE on network forget from details page." into oc-dr1-dev
am: e59ba746f1

Change-Id: I9bb7d9e9ea8b174ba2fe1d77d110cef658e152c8

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Jul 2017 05:16:14 +0000 (05:16 +0000)]

Merge "Fix NPE on network forget from details page." into oc-dr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 04:14:39 +0000 (04:14 +0000)]

Merge "Merge "Merge "Moving check for empty snapshots earlier." into oc-dr1-dev am: 161d65640e" into oc-dr1-dev-plus-aosp am: 509bfe5fb5"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 04:14:04 +0000 (04:14 +0000)]

Merge "Merge "Merge "Moving check for empty snapshots earlier." into oc-dr1-dev am: 161d65640e" into oc-dr1-dev-plus-aosp am: 509bfe5fb5"

commit | commitdiff | tree

Winson Chung [Thu, 6 Jul 2017 04:13:09 +0000 (04:13 +0000)]

Merge "Merge "Moving check for empty snapshots earlier." into oc-dr1-dev am: 161d65640e" into oc-dr1-dev-plus-aosp
am: 509bfe5fb5

Change-Id: Ie15a7478b9a56dab9bbcb91a3b01af7f55008101

commit | commitdiff | tree

Winson Chung [Thu, 6 Jul 2017 04:12:37 +0000 (04:12 +0000)]

Merge "Merge "Moving check for empty snapshots earlier." into oc-dr1-dev am: 161d65640e" into oc-dr1-dev-plus-aosp
am: 509bfe5fb5

Change-Id: I629e0117f5e9150786165ef45bba046a8a298478

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 04:12:28 +0000 (04:12 +0000)]

Merge "Merge "Merge "Disable auto-enter PIP when launching an assistant activity" into oc-dr1-dev am: 7ee9ec59d8" into oc-dr1-dev-plus-aosp am: 3fd761f85d"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 04:11:58 +0000 (04:11 +0000)]

Merge "Merge "Merge "Disable auto-enter PIP when launching an assistant activity" into oc-dr1-dev am: 7ee9ec59d8" into oc-dr1-dev-plus-aosp am: 3fd761f85d"

commit | commitdiff | tree

Winson Chung [Thu, 6 Jul 2017 04:10:46 +0000 (04:10 +0000)]

Merge "Merge "Disable auto-enter PIP when launching an assistant activity" into oc-dr1-dev am: 7ee9ec59d8" into oc-dr1-dev-plus-aosp
am: 3fd761f85d

Change-Id: Ib0c3e613fc916dd8b9fe32b2e49fd14cf4de22b2

frameworks/base

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.