As discussed with Romain Guy in the email thread, the Apache 2.0
license applies to the affected .jpg files now and retroactively from
the time of import.
The exiftool did not remove the old CreativeCommons metadata.
The images were altered using the bless hex editor to manually
overwrite the metadata.
$ exiftool -URL -WebStatement -UsageTerms tests/CanvasCompare/res/drawable/sunset1.jpg
URL : http://www.apache.org/licenses/LICENSE-2.0
Web Statement : http://www.apache.org/licenses/LICENSE-2.0
Usage Terms : Apache License Version 2.0
$ exiftool -URL -WebStatement -UsageTerms tests/HwAccelerationTest/res/drawable-hdpi/sunset1.jpg
URL : http://www.apache.org/licenses/LICENSE-2.0
Web Statement : http://www.apache.org/licenses/LICENSE-2.0
Usage Terms : Apache License Version 2.0
$ exiftool -URL -WebStatement -UsageTerms tests/HwAccelerationTest/res/drawable/sunset1.jpg
URL : http://www.apache.org/licenses/LICENSE-2.0
Web Statement : http://www.apache.org/licenses/LICENSE-2.0
Usage Terms : Apache License Version 2.0
Change-Id: Icbd8c8c65ca521751d63a213377e3ababff0b7da
* changes:
Revert "Take all VPN underlying networks into account when migrating traffic for"
Revert "NetworkStatsService: Fix getDetailedUidStats to take VPNs into account."
Revert "Addressing comments for http://ag/7700679."
Revert "Add one more test for VPN usage stats."
There might be a gap between fd close and fd event listener unregister.
If fd is reused for another query during that gap, it might cause the
query failed with no response since addOnFileDescriptorEventListener
method failed. To fix this problem, we must ensure that fd event
listener is unregistered before fd closing.
Bug: 134310704
Test: atest DnsResolverTest
Change-Id: Ifb6bd34dc54dcf1c61fe8b87785124df4bc0f410
This reverts commit 95aa6d446f.
Reason for revert: This change has been implicated in 4-way deadlocks as seen in b/134244752.
Bug: 134244752
Change-Id: I2f1839d7776a613ca571af8a542755ddc5fc8760
Merged-In: Ibdaad3a4cbf0d8ef1ed53cfab1e454b9b878bae9
This reverts commit 29d2ef2fe1.
Reason for revert: This change has been implicated in 4-way deadlocks as seen in b/134244752.
Bug: 134244752
Change-Id: I37f75c2b243ea548a88ef1dae88287405c6ef55f
Merged-In: I0c00e8f0e30cee987b71b561079a97bf09d4dae4
This reverts commit e4bfdccb57.
Reason for revert: This change has been implicated in 4-way deadlocks as seen in b/134244752.
Bug: 134244752
Change-Id: I12ab724e2ef8a5c1b42078330ba74713ff86fdd1
Merged-In: I5fbb3443a39a21fc9d96442726cd10d20e8d61cd
This reverts commit 4e4efe42a1.
Reason for revert: This change has been implicated in 4-way deadlocks as seen in b/134244752.
Bug: 134244752
Change-Id: I87ddc0af9ff6fbd9b7afd6d4d24985b9b7205416
Merged-In: I64b48d575f2e6ec4cb7d2d100a859a30af0501dc
The time zone data module is now functionally mandatory so
we can reference the files there instead.
Bug:132168458
Test: build only
Change-Id: Ie246be6882a128beddd1d9d4ee1c9bc02a821755
It is wrong array. The correct array is mUserMobileDataState.
Bug: 128510330
Test: build pass
Merged-In: I5db6329ce4699cca8d79a827c36f7f61a4fa8f92
Change-Id: I5db6329ce4699cca8d79a827c36f7f61a4fa8f92
Added override rules support for always allowing mms and
internet data during voice call.
Test: Manual + unit tests
Bug: 132113695
Merged-In: I2266d7f428901ccbba6bf538a7c7696e6566b96c
Change-Id: I2266d7f428901ccbba6bf538a7c7696e6566b96c
(cherry picked from commit 0d26d718b3)
The networkAttributesParcelable retrieved from IpMemoryStore might be
null, it might cause crash with NullPointerException when attepmting
to read from the field on a null object reference.
Bug: 122710829
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: Id7527199424e55f1e14836e81a5d1965d13013a2
am: c4a564a10a -s ours
am skip reason: change_id I4e06b3f93e30ed1c7868ec9e018709a7e796e441 with SHA1 c1493b283b is in history
Change-Id: I7b4bc1e7295383e9afa31210aff3c1bae6728831
