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

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

Santos Cordon [Wed, 11 Jan 2017 03:12:11 +0000 (03:12 +0000)]

Merge "Add Brightness setting for VR Mode." into nyc-mr2-dev
am: a00c235600

Change-Id: Idcf0447ec99e148b865c2f8fe25c614bc149aa32

commit | commitdiff | tree

Santos Cordon [Wed, 11 Jan 2017 03:12:05 +0000 (03:12 +0000)]

Add Brightness setting for VR Mode.
am: d6a5660a2c

Change-Id: If371f485471eb1ab0a3e07964c197cb9b8ef1c9f

commit | commitdiff | tree

Santos Cordon [Wed, 11 Jan 2017 03:02:52 +0000 (03:02 +0000)]

Merge "Add Brightness setting for VR Mode." into nyc-mr2-dev

commit | commitdiff | tree

Andreas Gampe [Wed, 11 Jan 2017 03:01:40 +0000 (03:01 +0000)]

Merge "Zygote: Add fdsToIgnore" am: 5b22a826d5 am: 140b9b65a1
am: e4cff36099

Change-Id: I89cd109839b4af2510a5b1789a146f7efea4cb80

commit | commitdiff | tree

Calin Juravle [Wed, 11 Jan 2017 02:58:50 +0000 (02:58 +0000)]

Merge changes I5b94a8f0,Ie6cdd846,Ie6b5f5e6,Ib962edf6,I9d779b2d, ... am: 619d6282c3 am: 6d0b836562
am: 8ad84c5e70

Change-Id: I3b632d25a35dca6601cd6b88862d1a302a9eb471

commit | commitdiff | tree

Calin Juravle [Wed, 11 Jan 2017 02:57:52 +0000 (02:57 +0000)]

Add an extra debug flag to BackgroundDexOptimizer am: 3a2b7f7d59 am: 236477e86e
am: f5d005b8c2

Change-Id: Icb9d089b68ec192b73b31b965c66f2f747ce220b

commit | commitdiff | tree

Calin Juravle [Wed, 11 Jan 2017 02:56:53 +0000 (02:56 +0000)]

Some refactoring in BackgroundDexOptService. am: 95176bb18e am: 377cc26e3a
am: e1a0a76381

Change-Id: Id97538a51933ccbb9c62511e5949664780b7e861

commit | commitdiff | tree

Calin Juravle [Wed, 11 Jan 2017 02:56:00 +0000 (02:56 +0000)]

Do not try to resolve realpath in DexManager. am: b96dba9bad am: b8f31d8a85
am: d86ca1cd25

Change-Id: I6b01cc2af9447ca2d5a871c6e1dd9ccf8d84e640

commit | commitdiff | tree

Calin Juravle [Wed, 11 Jan 2017 02:54:25 +0000 (02:54 +0000)]

Log DexManager realpath errors only in debug mode. am: 271bacbf5c am: 42c7fc7f27
am: 46b323869f

Change-Id: I55e04d69bba9d14f0527c648d29f8ec8b7bbddfb

commit | commitdiff | tree

Calin Juravle [Wed, 11 Jan 2017 02:53:31 +0000 (02:53 +0000)]

Record data about dex files use on disk am: 5a9094c1b6 am: dc10a3bdb0
am: ea1c34d45e

Change-Id: Ie9f489ff2ec89e9014eb683e269139ba633762bb

commit | commitdiff | tree

Calin Juravle [Wed, 11 Jan 2017 02:52:35 +0000 (02:52 +0000)]

Add logic for recording dex files use on disk am: 6ea5ace7b3 am: 34bdf1680a
am: bc7f234daa

Change-Id: Iaf2ffd60d374eef179705e35743338ff3d8105c3

commit | commitdiff | tree

Andreas Gampe [Wed, 11 Jan 2017 02:46:57 +0000 (02:46 +0000)]

Merge "Zygote: Add fdsToIgnore" am: 5b22a826d5
am: 140b9b65a1

Change-Id: Ib4c46887ed5d87ef143bd866320d77b75d8711a3

commit | commitdiff | tree

Calin Juravle [Wed, 11 Jan 2017 02:44:08 +0000 (02:44 +0000)]

Merge changes I5b94a8f0,Ie6cdd846,Ie6b5f5e6,Ib962edf6,I9d779b2d, ... am: 619d6282c3
am: 6d0b836562

Change-Id: I22594f44c2487a7b0933de9c298389f9a6688549

commit | commitdiff | tree

Calin Juravle [Wed, 11 Jan 2017 02:43:15 +0000 (02:43 +0000)]

Add an extra debug flag to BackgroundDexOptimizer am: 3a2b7f7d59
am: 236477e86e

Change-Id: I30686bda79e0400d6aaca8ee71ca0c449452ed31

commit | commitdiff | tree

Calin Juravle [Wed, 11 Jan 2017 02:42:21 +0000 (02:42 +0000)]

Some refactoring in BackgroundDexOptService. am: 95176bb18e
am: 377cc26e3a

Change-Id: If18489475e12e1d5c641f512a6b21f0ba70c6b6a

commit | commitdiff | tree

Calin Juravle [Wed, 11 Jan 2017 02:41:28 +0000 (02:41 +0000)]

Do not try to resolve realpath in DexManager. am: b96dba9bad
am: b8f31d8a85

Change-Id: I4b9e9c0781a4db89a49d588bcebb953c6144f5a3

commit | commitdiff | tree

Calin Juravle [Wed, 11 Jan 2017 02:40:14 +0000 (02:40 +0000)]

Log DexManager realpath errors only in debug mode. am: 271bacbf5c
am: 42c7fc7f27

Change-Id: I68f14e9a0b7507a93a9569e670b3693958fd7c09

commit | commitdiff | tree

Calin Juravle [Wed, 11 Jan 2017 02:39:00 +0000 (02:39 +0000)]

Record data about dex files use on disk am: 5a9094c1b6
am: dc10a3bdb0

Change-Id: Ife1e626d722ba129cdcb6cd4a8f454cf28ca267c

commit | commitdiff | tree

Calin Juravle [Wed, 11 Jan 2017 02:38:01 +0000 (02:38 +0000)]

Add logic for recording dex files use on disk am: 6ea5ace7b3
am: 34bdf1680a

Change-Id: I075e6c5224b374f2d03d711e4d5492d60e4da572

commit | commitdiff | tree

Andreas Gampe [Wed, 11 Jan 2017 02:33:05 +0000 (02:33 +0000)]

Merge "Zygote: Add fdsToIgnore"
am: 5b22a826d5

Change-Id: I458e354acf620cb434de41790ce94b814ff0a4ea

commit | commitdiff | tree

Stephen Chen [Wed, 11 Jan 2017 02:28:54 +0000 (02:28 +0000)]

Merge "Delete old WifiNotificationController strings." am: 6daef4499f am: f412290e94
am: 62f70c44b8

Change-Id: I95544b5507b89bc4354f49a191714fb3b56a09f6

commit | commitdiff | tree

Calin Juravle [Wed, 11 Jan 2017 02:28:11 +0000 (02:28 +0000)]

Merge changes I5b94a8f0,Ie6cdd846,Ie6b5f5e6,Ib962edf6,I9d779b2d, ...
am: 619d6282c3

Change-Id: I7f13f7a7557288f2b5cc515b424161c946241d5a

commit | commitdiff | tree

Calin Juravle [Wed, 11 Jan 2017 02:28:08 +0000 (02:28 +0000)]

Add an extra debug flag to BackgroundDexOptimizer
am: 3a2b7f7d59

Change-Id: I309923c247bef67ffbdba56955582f6decde3800

commit | commitdiff | tree

Calin Juravle [Wed, 11 Jan 2017 02:27:25 +0000 (02:27 +0000)]

Some refactoring in BackgroundDexOptService.
am: 95176bb18e

Change-Id: I191aeed8a7264bb13c4cef8b1ba135fd03a75d58

commit | commitdiff | tree

Calin Juravle [Wed, 11 Jan 2017 02:26:36 +0000 (02:26 +0000)]

Do not try to resolve realpath in DexManager.
am: b96dba9bad

Change-Id: I67aba48784bca9a51f63e47b54c211ba535dd0e4

commit | commitdiff | tree

Calin Juravle [Wed, 11 Jan 2017 02:25:05 +0000 (02:25 +0000)]

Log DexManager realpath errors only in debug mode.
am: 271bacbf5c

Change-Id: I94aca4959284912e6d5008f56617254be2fc3ea7

commit | commitdiff | tree

Stephen Chen [Wed, 11 Jan 2017 02:24:26 +0000 (02:24 +0000)]

Merge "Delete old WifiNotificationController strings." am: 6daef4499f
am: f412290e94

Change-Id: I40bfd75b95a299516d08b4fdf699317249156eda

commit | commitdiff | tree

Calin Juravle [Wed, 11 Jan 2017 02:24:14 +0000 (02:24 +0000)]

Record data about dex files use on disk
am: 5a9094c1b6

Change-Id: I50378b1351a5ae83ac55f1b26e2e0c5f3230c6d2

commit | commitdiff | tree

Calin Juravle [Wed, 11 Jan 2017 02:23:29 +0000 (02:23 +0000)]

Add logic for recording dex files use on disk
am: 6ea5ace7b3

Change-Id: I82246efd8e78c1c4ac18a67f0274b10545605207

commit | commitdiff | tree

Treehugger Robot [Wed, 11 Jan 2017 02:20:36 +0000 (02:20 +0000)]

Merge "Zygote: Add fdsToIgnore"

commit | commitdiff | tree

Stephen Chen [Wed, 11 Jan 2017 02:20:14 +0000 (02:20 +0000)]

Merge "Delete old WifiNotificationController strings."
am: 6daef4499f

Change-Id: I20a68ca904cc0ad8042be61820808f4ff4680bee

commit | commitdiff | tree

Treehugger Robot [Wed, 11 Jan 2017 02:15:28 +0000 (02:15 +0000)]

Merge changes I5b94a8f0,Ie6cdd846,Ie6b5f5e6,Ib962edf6,I9d779b2d, ...

* changes:
  Add an extra debug flag to BackgroundDexOptimizer
  Some refactoring in BackgroundDexOptService.
  Do not try to resolve realpath in DexManager.
  Log DexManager realpath errors only in debug mode.
  Record data about dex files use on disk
  Add logic for recording dex files use on disk

commit | commitdiff | tree

Treehugger Robot [Wed, 11 Jan 2017 02:12:48 +0000 (02:12 +0000)]

Merge "Delete old WifiNotificationController strings."

commit | commitdiff | tree

Jeremy Joslin [Wed, 11 Jan 2017 01:50:13 +0000 (01:50 +0000)]

Merge "Moved isCallerActiveScorer() to the score service." am: 663b444196 am: 5fbd2791ac
am: 11b1311e21

Change-Id: I9e00b4593005729cdf2b01e2347f0513a6d52cf0

commit | commitdiff | tree

Jeremy Joslin [Wed, 11 Jan 2017 01:45:43 +0000 (01:45 +0000)]

Merge "Moved isCallerActiveScorer() to the score service." am: 663b444196
am: 5fbd2791ac

Change-Id: If5649294845f01a390bccd47fe99add3b27b0829

commit | commitdiff | tree

Hugo Benichi [Wed, 11 Jan 2017 01:43:19 +0000 (01:43 +0000)]

Merge changes I559eb049,I52425b84 am: 60d10ea0f4 am: 575726487f
am: 5e4f253e6c

Change-Id: I348f7bf72778409db883c4bc0a27ff49a351ce38

commit | commitdiff | tree

Hugo Benichi [Wed, 11 Jan 2017 01:42:01 +0000 (01:42 +0000)]

DO NOT MERGE Captive portals: login activity probes like NetworkMonitor am: 2c02197bdd -s ours am: 2a913049ab -s ours
am: debe4cea39

Change-Id: I6f4c7a0c15373e56fc178f287f6a0eb54d0d4018

commit | commitdiff | tree

Jeremy Joslin [Wed, 11 Jan 2017 01:41:14 +0000 (01:41 +0000)]

Merge "Moved isCallerActiveScorer() to the score service."
am: 663b444196

Change-Id: I44134284edc88567703435ce663b3d0efd9cff26

commit | commitdiff | tree

Hugo Benichi [Wed, 11 Jan 2017 01:41:10 +0000 (01:41 +0000)]

DO NOT MERGE Logging improvements in CaptivePortalLoginActivity am: 7f086e162b -s ours am: 7520a07036 -s ours
am: fd13a23784

Change-Id: I7d87e45371cc337c44b9d3660afb48cfeabaf90d

commit | commitdiff | tree

Hugo Benichi [Wed, 11 Jan 2017 01:34:23 +0000 (01:34 +0000)]

Merge changes I1eaab5ea,I42928da8 am: b1e3c8aaf4 am: 22e7d2ed20
am: 994978461f

Change-Id: Id4b45a161e8b2d6b077bc27bd7ab797a308fea29

commit | commitdiff | tree

Hugo Benichi [Wed, 11 Jan 2017 01:32:49 +0000 (01:32 +0000)]

DO NOT MERGE Captive portal systel log improvements am: b32417a772 -s ours am: 6352f85398 -s ours
am: 9b07cb2fc1

Change-Id: Ie831b10e45cee740f519896312ede84ebb69e6f2

commit | commitdiff | tree

Hugo Benichi [Wed, 11 Jan 2017 01:31:54 +0000 (01:31 +0000)]

DO NOT MERGE Fix flaky IpPrefixTest. am: f6b180ff1a -s ours am: 68ec108b6e -s ours
am: b1a3f76900

Change-Id: Ieeeb425675715dc9910c4901f9c1bce7dbd168ad

commit | commitdiff | tree

John Reck [Wed, 11 Jan 2017 01:30:59 +0000 (01:30 +0000)]

Merge "Fix a use-of-uninitialized-value warning." am: 95ef9ec5b1 am: 44e14d0d2b
am: 5f3ed9b7de

Change-Id: I6e35191f4ddda2590eae4cfac9af5c781d0e493b

commit | commitdiff | tree

Treehugger Robot [Wed, 11 Jan 2017 01:30:02 +0000 (01:30 +0000)]

Merge "Moved isCallerActiveScorer() to the score service."

commit | commitdiff | tree

Hugo Benichi [Wed, 11 Jan 2017 01:29:11 +0000 (01:29 +0000)]

Merge changes I559eb049,I52425b84 am: 60d10ea0f4
am: 575726487f

Change-Id: I0b218cc9a6820380b8e32ea0e020d39929a42826

commit | commitdiff | tree

Hugo Benichi [Wed, 11 Jan 2017 01:27:40 +0000 (01:27 +0000)]

DO NOT MERGE Captive portals: login activity probes like NetworkMonitor am: 2c02197bdd -s ours
am: 2a913049ab -s ours

Change-Id: Icf09b29bfe619ee56d4e9ae0d640ed00fbb4ef31

commit | commitdiff | tree

Hugo Benichi [Wed, 11 Jan 2017 01:26:47 +0000 (01:26 +0000)]

DO NOT MERGE Logging improvements in CaptivePortalLoginActivity am: 7f086e162b -s ours
am: 7520a07036 -s ours

Change-Id: If035aa5fb1783bfc180c928969f08d89b5dd19f0

commit | commitdiff | tree

Hugo Benichi [Wed, 11 Jan 2017 01:25:09 +0000 (01:25 +0000)]

Merge changes I1eaab5ea,I42928da8 am: b1e3c8aaf4
am: 22e7d2ed20

Change-Id: I6b0a8e3c2831933199c8cb55ce8c666e8db186e3

commit | commitdiff | tree

Hugo Benichi [Wed, 11 Jan 2017 01:23:51 +0000 (01:23 +0000)]

DO NOT MERGE Captive portal systel log improvements am: b32417a772 -s ours
am: 6352f85398 -s ours

Change-Id: If06761b413cda9d3f79aa79e8ae60cf0ce306946

commit | commitdiff | tree

Hugo Benichi [Wed, 11 Jan 2017 01:22:35 +0000 (01:22 +0000)]

DO NOT MERGE Fix flaky IpPrefixTest. am: f6b180ff1a -s ours
am: 68ec108b6e -s ours

Change-Id: Ic492f64b8fc44dc9a8ca1abd539fe757c703acac

commit | commitdiff | tree

John Reck [Wed, 11 Jan 2017 01:21:30 +0000 (01:21 +0000)]

Merge "Fix a use-of-uninitialized-value warning." am: 95ef9ec5b1
am: 44e14d0d2b

Change-Id: I5e5243c75f446d46bb81252583cfa46e47d60309

commit | commitdiff | tree

Hugo Benichi [Wed, 11 Jan 2017 01:18:07 +0000 (01:18 +0000)]

Merge changes I559eb049,I52425b84
am: 60d10ea0f4

Change-Id: Ided0ebc7e0aaab0f88c2b0af7e3e99fa9e674a60

commit | commitdiff | tree

Hugo Benichi [Wed, 11 Jan 2017 01:18:00 +0000 (01:18 +0000)]

DO NOT MERGE Captive portals: login activity probes like NetworkMonitor
am: 2c02197bdd -s ours

Change-Id: I12ea7b87369c3228bb1fcc914cfdb316a3b501ce

commit | commitdiff | tree

Hugo Benichi [Wed, 11 Jan 2017 01:17:16 +0000 (01:17 +0000)]

DO NOT MERGE Logging improvements in CaptivePortalLoginActivity
am: 7f086e162b -s ours

Change-Id: Id2f32089145a13a199838d8c004504fee1c7c011

commit | commitdiff | tree

Hugo Benichi [Wed, 11 Jan 2017 01:14:10 +0000 (01:14 +0000)]

Merge changes I1eaab5ea,I42928da8
am: b1e3c8aaf4

Change-Id: I744394de40b72744ac60f3d6c2a138c6e876ee28

commit | commitdiff | tree

Hugo Benichi [Wed, 11 Jan 2017 01:14:04 +0000 (01:14 +0000)]

DO NOT MERGE Captive portal systel log improvements
am: b32417a772 -s ours

Change-Id: Ibce1d4e604e5fd8c67c012cd7f264e4585117b24

commit | commitdiff | tree

Hugo Benichi [Wed, 11 Jan 2017 01:12:54 +0000 (01:12 +0000)]

DO NOT MERGE Fix flaky IpPrefixTest.
am: f6b180ff1a -s ours

Change-Id: I929a0ef7a6a044d2263a04867c2701653c3634de

commit | commitdiff | tree

John Reck [Wed, 11 Jan 2017 01:11:59 +0000 (01:11 +0000)]

Merge "Fix a use-of-uninitialized-value warning."
am: 95ef9ec5b1

Change-Id: I0b088bc47b1311ace1000cc700fd81d56eec4b7f

commit | commitdiff | tree

Treehugger Robot [Wed, 11 Jan 2017 01:06:56 +0000 (01:06 +0000)]

Merge changes I559eb049,I52425b84

* changes:
DO NOT MERGE Captive portals: login activity probes like NetworkMonitor
DO NOT MERGE Logging improvements in CaptivePortalLoginActivity

commit | commitdiff | tree

Treehugger Robot [Wed, 11 Jan 2017 01:02:05 +0000 (01:02 +0000)]

Merge changes I1eaab5ea,I42928da8

* changes:
DO NOT MERGE Captive portal systel log improvements
DO NOT MERGE Fix flaky IpPrefixTest.

commit | commitdiff | tree

John Reck [Wed, 11 Jan 2017 00:57:34 +0000 (00:57 +0000)]

Merge "Fix a use-of-uninitialized-value warning."

commit | commitdiff | tree

Andreas Gampe [Thu, 5 Jan 2017 20:45:58 +0000 (12:45 -0800)]

Zygote: Add fdsToIgnore

Add file descriptors that should be ignored in the file descriptor
table check.

Use this to ignore the pipe file descriptors when starting an app
with invoke-with (wrapper).

Bug: 32607405
Test: m
Test: Device boots
Test: Apps start
Test: adb root && adb shell setprop wrap.com.android.calculator2 logwrapper && adb shell am start -S -n com.android.calculator2/.Calculator
Change-Id: I4a30dfc9382d3172cc815bd41b17a123799354f6

commit | commitdiff | tree

Calin Juravle [Thu, 22 Dec 2016 16:50:05 +0000 (18:50 +0200)]

Add an extra debug flag to BackgroundDexOptimizer

This makes testing/debugging the job a bit easier.

Test: device boots, packages get compiled
Bug: 32871170

(cherry picked from commit a50d58e22630cd651a815381639e70476991bdbf)

Change-Id: I5b94a8f0b3bbf9075dcaecf028aaf79a21aaab7b

commit | commitdiff | tree

Calin Juravle [Thu, 22 Dec 2016 16:50:05 +0000 (18:50 +0200)]

Some refactoring in BackgroundDexOptService.

Extract postOta/idle optimizations in their own method.
In preparation for adding the logic to handle secondary dex files.

Test: device boots, pacakges get compiled
Bug: 32871170

(cherry picked from commit be6a71a0b3f369843a26c91dd5123d0499f00e7e)

Change-Id: Ie6cdd8461e7214f5de68bc9172f4171ebf72aa39

commit | commitdiff | tree

Calin Juravle [Thu, 22 Dec 2016 16:47:05 +0000 (18:47 +0200)]

Do not try to resolve realpath in DexManager.

PM should already provide the real path of the application directory.

Test: runtest -x .../DexManagerTests.java

Bug: 33807524
Bug: 32871170

(cherry picked from commit c066205cea051c6d9f386188b9cb426c03dbee2d)

Change-Id: Ie6b5f5e61d08710e7ef7d3149b7b13cc7d03a242

commit | commitdiff | tree

Calin Juravle [Thu, 22 Dec 2016 14:31:19 +0000 (14:31 +0000)]

Log DexManager realpath errors only in debug mode.

Test: runtest -x .../DexManagerTests.java
Bug: 33807524

(cherry picked from commit bb9ed1f3c93f0267fa97d6cbeb58ecd1de41d795)

Change-Id: Ib962edf67ce7f5b9b93c9bc6855675e00e025810

commit | commitdiff | tree

Calin Juravle [Fri, 16 Dec 2016 16:22:00 +0000 (16:22 +0000)]

Record data about dex files use on disk

Add DexManager to keep track of how dex files are used.

Every time a dex file is loaded, PackageManager will notify DexManager
which will process the load. The DexManager will look up what package
owns the dex file and record its use in package-dex-usage.list (through
PackageDexUsage).

Test: device boots, package-dex-usage.list is created and contains valid data, after device reboot the list is succesfully read from disk.
runtest -x .../PackageDexUsageTests.java
runtest -x .../DexManagerTests.java

Bug: 32871170

(cherry picked from commit b8976d8f22fecaa9ed39276d9d8ded17d35b51a6)

Change-Id: I9d779b2d39814d7c54fc7a888df93d403a001df5

commit | commitdiff | tree

Calin Juravle [Thu, 1 Dec 2016 17:53:07 +0000 (17:53 +0000)]

Add logic for recording dex files use on disk

Add PackageDexUsage to handle the I/O operations of dex usage data. It
is responsible to encode, save and load dex

Test: runtest -x .../PackageDexUsageTests.java

Bug: 32871170

(cherry picked from commit 0318162abcbd07a0472989df43e00e353fac731b)

Change-Id: I6d483d480d62aa14cb1663560fd88092469a2835

commit | commitdiff | tree

Jeremy Joslin [Tue, 10 Jan 2017 00:22:20 +0000 (16:22 -0800)]

Moved isCallerActiveScorer() to the score service.

Implemented isCallerActiveScorer() in the NetworkScoreService to make
it more efficient (no need to query PM). Exposed the call as a new
internal API on NetworkScoreManager and deprecated the call on
NetworkScorerAppManager.

Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Bug: 33781558
Change-Id: I8ad232f8ef34b6e2f155ebb232e64300303300f0
Merged-In: I0e2142af95b068d322343f7c9362ac53d46b545e

commit | commitdiff | tree

Jordan Liu [Tue, 10 Jan 2017 23:55:55 +0000 (23:55 +0000)]

Merge "Fix naming of key" am: 0b74a1dabb am: c68c2f6885
am: 1d67d022fb

Change-Id: I6165395ac186baac90c2d08d7c7114c7b5bc72d3

commit | commitdiff | tree

Robert Sesek [Tue, 10 Jan 2017 23:53:40 +0000 (23:53 +0000)]

Merge changes Ia1f2535c,I9ca93f31,If5b53f6f,I119e0bfc am: 98d86fe2b7 am: c6d9f0fbce
am: 367f70cca4

Change-Id: I039178a775f15d9a6e82ab481d15896e243759e9

commit | commitdiff | tree

Robert Sesek [Tue, 10 Jan 2017 23:52:13 +0000 (23:52 +0000)]

Dynamically add the webview_zygote's preloaded APK to the zygote FD whitelist. am: 54e387ddbe am: 839a185b2e
am: df781cc514

Change-Id: I869aaa330de7fb0de2d608a6cbf7a8974e9757ba

commit | commitdiff | tree

Robert Sesek [Tue, 10 Jan 2017 23:51:14 +0000 (23:51 +0000)]

Split core/jni/fd_utils-inl.h into a .h/.cpp pair. am: 8225b7c951 am: 63a7fe6de8
am: 024793713f

Change-Id: If30588787332fbfcdf4573f976ec8ca086db8260

commit | commitdiff | tree

Narayan Kamath [Tue, 10 Jan 2017 23:50:23 +0000 (23:50 +0000)]

Zygote: Additional whitelisting for legacy devices. am: f701ba36b3 am: 7a69406767
am: 647986fd54

Change-Id: I1c508f812298bc9ec6870a3e655129e630e536e5

commit | commitdiff | tree

Jordan Liu [Tue, 10 Jan 2017 23:44:43 +0000 (23:44 +0000)]

Merge "Fix naming of key" am: 0b74a1dabb
am: c68c2f6885

Change-Id: Ibdd5177ea43ee9c2ea5603363429a7207a59d5ba

commit | commitdiff | tree

Andreas Gampe [Tue, 10 Jan 2017 23:42:19 +0000 (23:42 +0000)]

Merge "resolve merge conflicts of 53726c0bbfaf to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
am: ba33854fbc

Change-Id: I109dedc6bec6847b81a2a88b698938910a2715bf

commit | commitdiff | tree

Andreas Gampe [Tue, 10 Jan 2017 23:42:12 +0000 (23:42 +0000)]

resolve merge conflicts of 53726c0bbfaf to nyc-mr1-dev-plus-aosp
am: be3a8ad2ba

Change-Id: I76970ff769a4cad2b3d702f0282515fb58defcbb

commit | commitdiff | tree

Robert Sesek [Tue, 10 Jan 2017 23:41:13 +0000 (23:41 +0000)]

Merge changes Ia1f2535c,I9ca93f31,If5b53f6f,I119e0bfc am: 98d86fe2b7
am: c6d9f0fbce

Change-Id: I0010cbf45a5e9fc10f86dbfbda510d34ba4b7429

commit | commitdiff | tree

Robert Sesek [Tue, 10 Jan 2017 23:40:15 +0000 (23:40 +0000)]

Dynamically add the webview_zygote's preloaded APK to the zygote FD whitelist. am: 54e387ddbe
am: 839a185b2e

Change-Id: I1e761ea737447b347f2542419d18d1f42b1b50db

commit | commitdiff | tree

Robert Sesek [Tue, 10 Jan 2017 23:39:28 +0000 (23:39 +0000)]

Split core/jni/fd_utils-inl.h into a .h/.cpp pair. am: 8225b7c951
am: 63a7fe6de8

Change-Id: I9148523bae8466e56cf00d7624c53c22318215f7

commit | commitdiff | tree

Narayan Kamath [Tue, 10 Jan 2017 23:38:18 +0000 (23:38 +0000)]

Zygote: Additional whitelisting for legacy devices. am: f701ba36b3
am: 7a69406767

Change-Id: I932aa16137686cce2be00a13f32978df34857709

commit | commitdiff | tree

Andreas Gampe [Tue, 10 Jan 2017 23:34:41 +0000 (23:34 +0000)]

Merge "resolve merge conflicts of 53726c0bbfaf to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

George Burgess IV [Tue, 10 Jan 2017 23:33:57 +0000 (15:33 -0800)]

Fix a use-of-uninitialized-value warning.

This warning was generated by the static analyzer:
warning: The left expression of the compound assignment is an
uninitialized value. The computed value will also be garbage
*mDirtyMask |= animator->dirtyMask();

This can be fixed by initializing dirtyMask before using it in
AnimateFunctor.

Bug: None
Test: Static analyzer no longer complains about this.
Change-Id: I892749079cf93a012f1bed059a3f0c8bbaed9d7e

commit | commitdiff | tree

Andreas Gampe [Tue, 10 Jan 2017 23:12:18 +0000 (15:12 -0800)]

resolve merge conflicts of 53726c0bbfaf to nyc-mr1-dev-plus-aosp

Change-Id: Iddf65660f9ac1d66907c8a3d2a3d34d9f3f66d81

commit | commitdiff | tree

Jordan Liu [Tue, 10 Jan 2017 22:59:18 +0000 (22:59 +0000)]

Merge "Fix naming of key"
am: 0b74a1dabb

Change-Id: I8eaaee259d96c2c2da70828cd882a86ae6bde8f1

commit | commitdiff | tree

Jordan Liu [Tue, 10 Jan 2017 22:51:49 +0000 (22:51 +0000)]

Merge "Fix naming of key"

commit | commitdiff | tree

Jeremy Joslin [Tue, 10 Jan 2017 22:48:47 +0000 (22:48 +0000)]

Merge "Cleanup test method names." am: 8e9fd295c8 am: 361412ced4
am: f41881b7fe

Change-Id: I779562d42a399beaa8df47050d68a6fc95f47fba

commit | commitdiff | tree

Jeremy Joslin [Tue, 10 Jan 2017 22:39:23 +0000 (22:39 +0000)]

Merge "Cleanup test method names." am: 8e9fd295c8
am: 361412ced4

Change-Id: I160b077d4faff67a721e9557f7dae10682dc2d81

commit | commitdiff | tree

Robert Sesek [Tue, 10 Jan 2017 22:33:04 +0000 (22:33 +0000)]

Merge changes Ia1f2535c,I9ca93f31,If5b53f6f,I119e0bfc
am: 98d86fe2b7

Change-Id: If98bcf93212e84c0e01eb3281b729e1760762356

commit | commitdiff | tree

Robert Sesek [Tue, 10 Jan 2017 22:33:00 +0000 (22:33 +0000)]

Dynamically add the webview_zygote's preloaded APK to the zygote FD whitelist.
am: 54e387ddbe

Change-Id: I7b4e809767e4cdd64da4094decc929504e1e93d8

commit | commitdiff | tree

Robert Sesek [Tue, 10 Jan 2017 22:32:05 +0000 (22:32 +0000)]

Split core/jni/fd_utils-inl.h into a .h/.cpp pair.
am: 8225b7c951

Change-Id: Ic5a021e5851f158caddc7f58ad7098a070f6219a

commit | commitdiff | tree

Narayan Kamath [Tue, 10 Jan 2017 22:30:41 +0000 (22:30 +0000)]

Zygote: Additional whitelisting for legacy devices.
am: f701ba36b3

Change-Id: Ic12fdc0261f258dcd1019290a057fef4fcedd0f3

commit | commitdiff | tree

Narayan Kamath [Tue, 10 Jan 2017 22:29:55 +0000 (22:29 +0000)]

Zygote: Additional whitelists for runtime overlay / other static resources.
am: 0ff7ef60f5

Change-Id: Ia4ee03a2a8e801918306cacf5ff1f69401f3847d

commit | commitdiff | tree

Jeremy Joslin [Tue, 10 Jan 2017 22:28:51 +0000 (22:28 +0000)]

Merge "Cleanup test method names."
am: 8e9fd295c8

Change-Id: Idb000e2b6cd8b7ba2046d329e039f6b05424686e

commit | commitdiff | tree

Treehugger Robot [Tue, 10 Jan 2017 22:21:01 +0000 (22:21 +0000)]

Merge changes Ia1f2535c,I9ca93f31,If5b53f6f,I119e0bfc

* changes:
  Dynamically add the webview_zygote's preloaded APK to the zygote FD whitelist.
  Split core/jni/fd_utils-inl.h into a .h/.cpp pair.
  Zygote: Additional whitelisting for legacy devices.
  Zygote: Additional whitelists for runtime overlay / other static resources.

commit | commitdiff | tree

Treehugger Robot [Tue, 10 Jan 2017 22:18:56 +0000 (22:18 +0000)]

Merge "Cleanup test method names."

commit | commitdiff | tree

Tao Wu [Tue, 10 Jan 2017 21:39:19 +0000 (21:39 +0000)]

Merge "Remove unused variable." am: f3b1881bb2 am: f338ed34f9
am: cab27fbbf4

Change-Id: I454d6359029bdbffa5e124e31759f30d6aec5f76

commit | commitdiff | tree

Tao Wu [Tue, 10 Jan 2017 21:34:20 +0000 (21:34 +0000)]

Merge "Remove unused variable." am: f3b1881bb2
am: f338ed34f9

Change-Id: Ia2ab8632bfe5e5b4751bb89aad30c3c739112469

commit | commitdiff | tree

Tao Wu [Tue, 10 Jan 2017 21:29:16 +0000 (21:29 +0000)]

Merge "Remove unused variable."
am: f3b1881bb2

Change-Id: I563647e4f5abc635ff3f67d7f0b658bdd1d92716