OSDN Git Service

android-x86/packages-apps-Gallery2.git
18 months agoSnap for 5582435 from c64375f263e6ed1dc7f0bc06477b54d17fb768af to qt-qpr1-release q-x86
android-build-team Robot [Sat, 18 May 2019 23:30:25 +0000 (23:30 +0000)]
Snap for 5582435 from c64375f263e6ed1dc7f0bc06477b54d17fb768af to qt-qpr1-release

Change-Id: Ib858b81acd43dfe4f9654cac65fb58ba49e59516

18 months ago[automerger skipped] Import translations. DO NOT MERGE am: e983b7a383 -s ours
Bill Yi [Sat, 18 May 2019 15:11:07 +0000 (08:11 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am: e983b7a383 -s ours
am: 2aeb885676 -s ours
am skip reason: subject contains skip directive

Change-Id: I31bb5b947534de90014831cde3ea735ae6b459d4

18 months ago[automerger skipped] Import translations. DO NOT MERGE
Bill Yi [Sat, 18 May 2019 14:58:55 +0000 (07:58 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am: e983b7a383 -s ours
am skip reason: subject contains skip directive

Change-Id: I1c575f6ecf663f1b356c52cd4ec44bacc518d309

18 months agoImport translations. DO NOT MERGE
Bill Yi [Sat, 18 May 2019 01:00:09 +0000 (18:00 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I0a966ab311614d148626445442c341246ddf4a44

19 months agoImport translations. DO NOT MERGE
Bill Yi [Wed, 17 Apr 2019 07:25:34 +0000 (00:25 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I59f1269fc58459f9de511ec59d443e2b2b409a1f

21 months agoMerge stage-aosp-master into pi-dev-plus-aosp
Xin Li [Mon, 25 Feb 2019 09:29:28 +0000 (01:29 -0800)]
Merge stage-aosp-master into pi-dev-plus-aosp
am: 7f7f14ed50

Change-Id: I209c7680f4d3c2bef81892c94b936e71ebab82dd

21 months agoMerge stage-aosp-master into pi-dev-plus-aosp
Xin Li [Mon, 25 Feb 2019 08:30:58 +0000 (00:30 -0800)]
Merge stage-aosp-master into pi-dev-plus-aosp

Bug: 126125118
Change-Id: I44825761907583ae4fd81be7113a84e95d812ae4

21 months agoDO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
Xin Li [Thu, 21 Feb 2019 17:25:05 +0000 (09:25 -0800)]
DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: Ic2fb4d7f00d9c3d38039bdcbdc112fa0a9b21d71

21 months ago[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master" am...
Xin Li [Wed, 20 Feb 2019 20:15:37 +0000 (12:15 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master" am: 7c5b0753fe -s ours am: 6a55bb273a -s ours
am: ccb8c39568 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie1d94fce5101c4148db07abac4eff97374297ff9

21 months ago[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master" am...
Xin Li [Wed, 20 Feb 2019 19:39:19 +0000 (11:39 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master" am: 7c5b0753fe -s ours
am: 6a55bb273a -s ours
am skip reason: subject contains skip directive

Change-Id: I1823a4a4bc18dbd327e23de8794d6dd41f661ea2

21 months ago[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"
Xin Li [Wed, 20 Feb 2019 18:53:28 +0000 (10:53 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"
am: 7c5b0753fe -s ours
am skip reason: subject contains skip directive

Change-Id: Ia8f2bf211c1e6ab06307fb51fb2f74c7c6f02bb6

21 months ago[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: 446d81552c...
Xin Li [Wed, 20 Feb 2019 18:15:13 +0000 (10:15 -0800)]
[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: 446d81552c -s ours am: e7b27a2a3d -s ours
am: cd9cb59167 -s ours
am skip reason: subject contains skip directive

Change-Id: I995962731a908b517e2a264a82cab90b72c9da47

21 months ago[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: 446d81552c...
Xin Li [Wed, 20 Feb 2019 17:28:03 +0000 (09:28 -0800)]
[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: 446d81552c -s ours
am: e7b27a2a3d -s ours
am skip reason: subject contains skip directive

Change-Id: I9476cbfd6ac53067ec777e83e7af664aea17a597

21 months ago[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master
Xin Li [Wed, 20 Feb 2019 16:51:31 +0000 (08:51 -0800)]
[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master
am: 446d81552c -s ours
am skip reason: subject contains skip directive

Change-Id: Iff30b2c25119f759b74f85ef1e9f6e92af309744

21 months agoMerge "DO NOT MERGE - Merge PPRL.190205.001 into master"
Xin Li [Wed, 20 Feb 2019 16:26:00 +0000 (16:26 +0000)]
Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"

21 months agoDO NOT MERGE - Merge PPRL.190205.001 into master
Xin Li [Mon, 18 Feb 2019 23:58:42 +0000 (15:58 -0800)]
DO NOT MERGE - Merge PPRL.190205.001 into master

Bug: 124234733
Change-Id: Ibdf39ce05bae85c50dc12eaa21721857f84381ce

21 months ago[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into...
Xin Li [Fri, 15 Feb 2019 05:07:21 +0000 (21:07 -0800)]
[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master am: c1dcf12214 -s ours
am: ace5b74415 -s ours
am skip reason: subject contains skip directive

Change-Id: I3f387eb027047ad1bd199f1032a20152e3455d8f

21 months ago[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into...
Xin Li [Thu, 14 Feb 2019 22:39:13 +0000 (14:39 -0800)]
[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
am: c1dcf12214 -s ours
am skip reason: subject contains skip directive

Change-Id: I1c237e8bdf26bb966971330e2eace58b7519b2d9

21 months agoDO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
Xin Li [Tue, 12 Feb 2019 17:53:42 +0000 (09:53 -0800)]
DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master

Bug: 124234733
Change-Id: I5754f3331ae0caa707ef0f81e3eb0d7467aeff61

21 months agoSnap for 5180536 from 97d2878b67b9f270aa1042c366f41e0cb80fdbf1 to pi-platform-release
android-build-team Robot [Sat, 9 Feb 2019 02:22:12 +0000 (02:22 +0000)]
Snap for 5180536 from 97d2878b67b9f270aa1042c366f41e0cb80fdbf1 to pi-platform-release

Change-Id: I8230d805506a2ff3abc48c328caffb843eecb80c

22 months agoMerge "app/Gallery2/Gallery2.apk app - update the version to target P (28) or higher...
Raman Tenneti [Tue, 22 Jan 2019 23:48:49 +0000 (15:48 -0800)]
Merge "app/Gallery2/Gallery2.apk app - update the version to target P (28) or higher. Use JobIntentService to start the AsyncService." am: 5c232b2f41 am: 56da2b67a5
am: 4864d1d884

Change-Id: Id2e94f4cfb94f0b748af094152675e371272c966

22 months agoMerge "app/Gallery2/Gallery2.apk app - update the version to target P (28) or higher...
Raman Tenneti [Tue, 22 Jan 2019 23:40:44 +0000 (15:40 -0800)]
Merge "app/Gallery2/Gallery2.apk app - update the version to target P (28) or higher. Use JobIntentService to start the AsyncService." am: 5c232b2f41
am: 56da2b67a5

Change-Id: I03ab8524d20373012a0e9ba9b11c3316f78a1411

22 months agoMerge "app/Gallery2/Gallery2.apk app - update the version to target P (28) or higher...
Raman Tenneti [Tue, 22 Jan 2019 23:31:38 +0000 (15:31 -0800)]
Merge "app/Gallery2/Gallery2.apk app - update the version to target P (28) or higher. Use JobIntentService to start the AsyncService."
am: 5c232b2f41

Change-Id: I71aa836e07bdf33e13ea0df421da2594561b4558

22 months agoMerge "app/Gallery2/Gallery2.apk app - update the version to target P (28) or higher...
Treehugger Robot [Tue, 22 Jan 2019 23:16:40 +0000 (23:16 +0000)]
Merge "app/Gallery2/Gallery2.apk app - update the version to target P (28) or higher. Use JobIntentService to start the AsyncService."

22 months agoapp/Gallery2/Gallery2.apk app - update the version to target P (28) or higher. Use...
Raman Tenneti [Fri, 18 Jan 2019 21:54:41 +0000 (13:54 -0800)]
app/Gallery2/Gallery2.apk app - update the version to target P (28) or higher. Use JobIntentService to start the AsyncService.

Bug: 115499280
Bug: 119501125

Test: manual - Tested the Gallery UI manually on Pixel phone and ran the following Gallery CTS tests.

$ make -j 40
  -rw-r--r-- 1 rtenneti primarygroup 5505290 Jan 18 18:10 out/target/product/marlin/system/product/app/Gallery2/Gallery2.apk

$ adb install -r -d out/target/product/marlin/system/product/app/Gallery2/Gallery2.apk

$ forrest test \
  --test_location=remote \
  --test_bench_config=presubmit/avd-cf \
  --gerrit_hostname android th:cl:878181:aosp_cf_x86_phone-userdebug:aosp-master \
  atp:avd/avd_boot_test

   https://forrest.googleplex.com/request/L36600000251931014

CTS tests for Gallery2 app
--------------------------
$ make CtsWidgetTestCases -j
  -rw-r--r-- 1 rtenneti primarygroup 3308652 Jan 22 11:28 out/host/linux-x86/cts/android-cts/testcases/CtsWidgetTestCases.apk

./development/testrunner/runtest.py --path cts/tests/tests/widget/src/android/widget/cts/GalleryTest.java
  android.widget.cts.GalleryTest:................
  Time: 3.271
  OK (16 tests)

./development/testrunner/runtest.py --path cts/tests/tests/view/src/android/view/cts/ViewTest.java
  android.view.cts.ViewTest:...
  Time: 45.6
  OK (217 tests)

./development/testrunner/runtest.py --path cts/tests/tests/text/src/android/text/method/cts/CharacterPickerDialogTest.java
  android.text.method.cts.CharacterPickerDialogTest:....
  Time: 0.886
  OK (4 tests)

./development/testrunner/runtest.py --path cts/tests/tests/widget/src/android/widget/cts/Gallery_LayoutParamsTest.java
  android.widget.cts.Gallery_LayoutParamsTest:.
  Time: 0.059
  OK (1 test)

./development/testrunner/runtest.py --path cts/tests/tests/widget/src/android/widget/cts/AbsSpinnerTest.java
  android.widget.cts.AbsSpinnerTest:.........
  Time: 1.646
  OK (9 tests)

Change-Id: I9cd9ae3aac2fe09d9da91e859828ab9eec49ccab

22 months agoMerge "Revert "Disable XOM in libjni_jpegstream."" am: a12f92690e am: 48e33926e8
Ivan Lozano [Wed, 16 Jan 2019 18:03:54 +0000 (10:03 -0800)]
Merge "Revert "Disable XOM in libjni_jpegstream."" am: a12f92690e am: 48e33926e8
am: ff32eaeaf0

Change-Id: If380f922f3b6bb1f0be0d53ab64036e267581627

22 months agoMerge "Revert "Disable XOM in libjni_jpegstream."" am: a12f92690e
Ivan Lozano [Wed, 16 Jan 2019 17:58:57 +0000 (09:58 -0800)]
Merge "Revert "Disable XOM in libjni_jpegstream."" am: a12f92690e
am: 48e33926e8

Change-Id: I98126498b83673f045a568926e1a4d9eec9c24b9

22 months agoMerge "Revert "Disable XOM in libjni_jpegstream.""
Ivan Lozano [Wed, 16 Jan 2019 17:52:51 +0000 (09:52 -0800)]
Merge "Revert "Disable XOM in libjni_jpegstream.""
am: a12f92690e

Change-Id: Ib7b3ace2af4a108b650f391120b97d768fa30fa1

22 months agoMerge "Revert "Disable XOM in libjni_jpegstream.""
Treehugger Robot [Wed, 16 Jan 2019 17:37:32 +0000 (17:37 +0000)]
Merge "Revert "Disable XOM in libjni_jpegstream.""

22 months agoMerge "Add default code reviewers into OWNERS" am: dd344c9f3d am: 48bfeeaf64
Chih-hung Hsieh [Tue, 15 Jan 2019 22:37:31 +0000 (14:37 -0800)]
Merge "Add default code reviewers into OWNERS" am: dd344c9f3d am: 48bfeeaf64
am: fea766f71e

Change-Id: I2315184920042bcde625d7526e3f800af8a57de1

22 months agoMerge "Add default code reviewers into OWNERS" am: dd344c9f3d
Chih-hung Hsieh [Tue, 15 Jan 2019 22:24:19 +0000 (14:24 -0800)]
Merge "Add default code reviewers into OWNERS" am: dd344c9f3d
am: 48bfeeaf64

Change-Id: Idad4597abf6c07854696799a7775b82c0b85dacd

22 months agoRevert "Disable XOM in libjni_jpegstream."
Ivan Lozano [Tue, 15 Jan 2019 22:16:32 +0000 (22:16 +0000)]
Revert "Disable XOM in libjni_jpegstream."

This reverts commit fab93599d36b671167a12a957b8a339abd99619e.

Reason for revert: libjpeg-turbo has been updated with XOM compatibility.

Change-Id: Ia40f4046ba367af494d10ce6084157264e69fdf2

22 months agoMerge "Add default code reviewers into OWNERS"
Chih-hung Hsieh [Tue, 15 Jan 2019 22:15:19 +0000 (14:15 -0800)]
Merge "Add default code reviewers into OWNERS"
am: dd344c9f3d

Change-Id: Id393544c009ff5bbb424c01aca76f0558b60a079

22 months agoMerge "Add default code reviewers into OWNERS"
Chih-hung Hsieh [Tue, 15 Jan 2019 21:57:55 +0000 (21:57 +0000)]
Merge "Add default code reviewers into OWNERS"

22 months agoAdd default code reviewers into OWNERS
Chih-Hung Hsieh [Tue, 15 Jan 2019 20:12:40 +0000 (12:12 -0800)]
Add default code reviewers into OWNERS

Bug: 33166666
Test: gerrit uploader
Change-Id: I629829274b6359bf2b4780a4d08835d57fc19059

22 months agoMerge "Move Gallery2 and its libs to /product" am: 54f4f9153d am: 4453b6aec7
Anton Hansson [Mon, 14 Jan 2019 09:57:36 +0000 (01:57 -0800)]
Merge "Move Gallery2 and its libs to /product" am: 54f4f9153d am: 4453b6aec7
am: b50ae5f65c

Change-Id: I96a1af41c725c5dc71eaa4f9544eef70e0a25fe1

22 months agoMerge "Move Gallery2 and its libs to /product" am: 54f4f9153d
Anton Hansson [Mon, 14 Jan 2019 09:37:32 +0000 (01:37 -0800)]
Merge "Move Gallery2 and its libs to /product" am: 54f4f9153d
am: 4453b6aec7

Change-Id: I1e25a709d087e9b9f5918394a6770f1d5d7bb3bb

22 months agoMerge "Move Gallery2 and its libs to /product"
Anton Hansson [Mon, 14 Jan 2019 09:21:52 +0000 (01:21 -0800)]
Merge "Move Gallery2 and its libs to /product"
am: 54f4f9153d

Change-Id: I544ffbbefd7d877c57ef4359eaf2b6966728512b

22 months agoMerge "Move Gallery2 and its libs to /product"
Anton Hansson [Mon, 14 Jan 2019 09:08:15 +0000 (09:08 +0000)]
Merge "Move Gallery2 and its libs to /product"

22 months agoMove Gallery2 and its libs to /product
Anton Hansson [Fri, 11 Jan 2019 14:54:49 +0000 (14:54 +0000)]
Move Gallery2 and its libs to /product

This app is frequently overriden by proprietary apps
on shipping devices, so move it to /product along with
its jni libs.

Bug: 122353713
Test: launch gallery on aosp_arm64 emulator
Change-Id: I5f7ae53ef41a26c1b89b93cdae24178c2a99e261

22 months agoMerge "Revert "SYSTEM/app/Gallery2/Gallery2.apk app - update the version to target...
Raman Tenneti [Mon, 7 Jan 2019 23:48:35 +0000 (15:48 -0800)]
Merge "Revert "SYSTEM/app/Gallery2/Gallery2.apk app - update the version to target P (28) or higher."" am: 6b26017b72 am: 350c8ec39b
am: 3eff83b096

Change-Id: Ic015eb4c2fba484b5f0ed2778e38bf49bccee599

22 months agoMerge "Revert "SYSTEM/app/Gallery2/Gallery2.apk app - update the version to target...
Raman Tenneti [Mon, 7 Jan 2019 23:40:44 +0000 (15:40 -0800)]
Merge "Revert "SYSTEM/app/Gallery2/Gallery2.apk app - update the version to target P (28) or higher."" am: 6b26017b72
am: 350c8ec39b

Change-Id: I1648a4b369ee3e65d1f6c994a521647462d1e75d

22 months agoMerge "Revert "SYSTEM/app/Gallery2/Gallery2.apk app - update the version to target...
Raman Tenneti [Mon, 7 Jan 2019 23:33:37 +0000 (15:33 -0800)]
Merge "Revert "SYSTEM/app/Gallery2/Gallery2.apk app - update the version to target P (28) or higher.""
am: 6b26017b72

Change-Id: I5246f6ce872a67b1fe09fa995b0e2a9389e6f5c3

22 months agoMerge "Revert "SYSTEM/app/Gallery2/Gallery2.apk app - update the version to target...
Raman Tenneti [Mon, 7 Jan 2019 23:19:54 +0000 (23:19 +0000)]
Merge "Revert "SYSTEM/app/Gallery2/Gallery2.apk app - update the version to target P (28) or higher.""

22 months agoRevert "SYSTEM/app/Gallery2/Gallery2.apk app - update the version to target P (28...
Raman Tenneti [Mon, 7 Jan 2019 23:10:34 +0000 (23:10 +0000)]
Revert "SYSTEM/app/Gallery2/Gallery2.apk app - update the version to target P (28) or higher."

This reverts commit 7ff2227efdca7c79eafbb2713dffa2e0ac06bab4.

Reason for revert: b/122473906
  java.lang.AssertionError: Error details:
  java.lang.RuntimeException: Unable to start receiver com.android.gallery3d.app.PackagesMonitor: java.lang.IllegalStateException: Not allowed to start service Intent { act=android.intent.action.PACKAGE_CHANGED dat=package:com.android.nfc flg=0x5000010 cmp=com.android.gallery3d/.app.PackagesMonitor$AsyncService (has extras) }: app is in background uid UidRecord{bf15789 u0a43 RCVR idle change:uncached procs:1 seq(0,0,0)}
at android.app.ActivityThread.handleReceiver(ActivityThread.java:3520)system_app_crash: Process: com.android.gallery3d

Change-Id: Ib396fb544eb85d91dbc75ef4a71c4e99d6f19998

22 months agoMerge "SYSTEM/app/Gallery2/Gallery2.apk app - update the version to target P (28...
Raman Tenneti [Sat, 5 Jan 2019 02:07:03 +0000 (18:07 -0800)]
Merge "SYSTEM/app/Gallery2/Gallery2.apk app - update the version to target P (28) or higher." am: 7110b74460 am: 7a5ffdc6d0
am: 7a2971bc1f

Change-Id: I8e7dd9051dbf2d931a34cfba4ac7b1ae26719f2e

22 months agoMerge "SYSTEM/app/Gallery2/Gallery2.apk app - update the version to target P (28...
Raman Tenneti [Sat, 5 Jan 2019 02:03:53 +0000 (18:03 -0800)]
Merge "SYSTEM/app/Gallery2/Gallery2.apk app - update the version to target P (28) or higher." am: 7110b74460
am: 7a5ffdc6d0

Change-Id: Ice39405f74ee473fdf6ead8f91b8e21811585772

22 months agoMerge "SYSTEM/app/Gallery2/Gallery2.apk app - update the version to target P (28...
Raman Tenneti [Sat, 5 Jan 2019 01:57:52 +0000 (17:57 -0800)]
Merge "SYSTEM/app/Gallery2/Gallery2.apk app - update the version to target P (28) or higher."
am: 7110b74460

Change-Id: I564f7e2864ebe778487765159cdcc85a18ffb913

22 months agoMerge "SYSTEM/app/Gallery2/Gallery2.apk app - update the version to target P (28...
Treehugger Robot [Sat, 5 Jan 2019 01:46:35 +0000 (01:46 +0000)]
Merge "SYSTEM/app/Gallery2/Gallery2.apk app - update the version to target P (28) or higher."

22 months agoSYSTEM/app/Gallery2/Gallery2.apk app - update the version to target P (28) or higher.
Raman Tenneti [Sat, 5 Jan 2019 00:04:46 +0000 (16:04 -0800)]
SYSTEM/app/Gallery2/Gallery2.apk app - update the version to target P (28) or higher.

Bug: 115499280
Bug: 119501125

Test: manual - Tested the Gallery UI manually on Pixel phone.

$ make -j 40
  -rw-r--r-- 1 rtenneti primarygroup 5501194 Jan  4 15:54 out/target/product/marlin/system/app/Gallery2/Gallery2.apk

$ aapt list -a out/target/product/marlin/system/app/Gallery2/Gallery2.apk | grep SdkVersion
    A: android:compileSdkVersion(0x01010572)=(type 0x10)0x1c
    A: android:compileSdkVersionCodename(0x01010573)="Q" (Raw: "Q")
      A: android:minSdkVersion(0x0101020c)="Q" (Raw: "Q")
      A: android:targetSdkVersion(0x01010270)=(type 0x10)0x1c

$ adb install -r -d out/target/product/marlin/system/app/Gallery2/Gallery2.apk

Change-Id: I33ca064531724b25798251b97fc7a3b71b02fb31

23 months ago[automerger skipped] Import translations. DO NOT MERGE am: a4ed762deb -s ours
Bill Yi [Sat, 29 Dec 2018 17:00:35 +0000 (09:00 -0800)]
[automerger skipped] Import translations. DO NOT MERGE am: a4ed762deb  -s ours
am: 4c1c489ea1  -s ours

Change-Id: I3d7e5c070036b40c06755023424e8ae108edea09

23 months ago[automerger skipped] Import translations. DO NOT MERGE
Bill Yi [Sat, 29 Dec 2018 16:55:41 +0000 (08:55 -0800)]
[automerger skipped] Import translations. DO NOT MERGE
am: a4ed762deb  -s ours

Change-Id: I04e50284b8b8a57d16dd2e66d88af826bac3afc6

23 months agoImport translations. DO NOT MERGE
Bill Yi [Sat, 29 Dec 2018 00:04:23 +0000 (16:04 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I0052b34e6b1e322be124b99ccd51866d0debe51d

23 months ago[automerger skipped] Merge "DO NOT MERGE" am: 13faf565ff -s ours am: a09f89ac50...
The Android Open Source Project [Fri, 7 Dec 2018 02:45:14 +0000 (18:45 -0800)]
[automerger skipped] Merge "DO NOT MERGE" am: 13faf565ff  -s ours am: a09f89ac50  -s ours
am: 3ff855c94c  -s ours

Change-Id: Iaecee108e456a27e5e31806cf004f6bf493ba45c

23 months ago[automerger skipped] Merge "DO NOT MERGE" am: 13faf565ff -s ours
The Android Open Source Project [Fri, 7 Dec 2018 02:23:03 +0000 (18:23 -0800)]
[automerger skipped] Merge "DO NOT MERGE" am: 13faf565ff  -s ours
am: a09f89ac50  -s ours

Change-Id: I6ded7423b1ce7fa96cac2f21f9a723dae04006bf

23 months ago[automerger skipped] Merge "DO NOT MERGE"
The Android Open Source Project [Fri, 7 Dec 2018 01:57:25 +0000 (17:57 -0800)]
[automerger skipped] Merge "DO NOT MERGE"
am: 13faf565ff  -s ours

Change-Id: I6a1e5432df10cca673f3c8cc0849c030ab40d291

23 months agoMerge "DO NOT MERGE"
Treehugger Robot [Fri, 7 Dec 2018 01:38:20 +0000 (01:38 +0000)]
Merge "DO NOT MERGE"

23 months agoDO NOT MERGE
The Android Open Source Project [Thu, 6 Dec 2018 22:11:37 +0000 (14:11 -0800)]
DO NOT MERGE

Merge pie-platform-release (PPRL.181105.017, history only) into master

Bug: 118454372
Change-Id: I5ed114a4d466cb2c346547c0fcc16acd02965cd1

23 months agoImport translations. DO NOT MERGE
Bill Yi [Thu, 6 Dec 2018 15:29:31 +0000 (07:29 -0800)]
Import translations. DO NOT MERGE

Change-Id: I0693f201ff8628a57d9921028234dd8fdb7f0937
Auto-generated-cl: translation import

23 months agoMerge "Disable XOM in libjni_jpegstream." am: e768dafffd am: a2aac739f2
Ivan Lozano [Fri, 30 Nov 2018 08:45:12 +0000 (00:45 -0800)]
Merge "Disable XOM in libjni_jpegstream." am: e768dafffd am: a2aac739f2
am: 087fedaf9d

Change-Id: I38dc60ec72c6e9ac1cf98f68e700d7c95c714b69

23 months agoMerge "Disable XOM in libjni_jpegstream." am: e768dafffd
Ivan Lozano [Fri, 30 Nov 2018 08:36:45 +0000 (00:36 -0800)]
Merge "Disable XOM in libjni_jpegstream." am: e768dafffd
am: a2aac739f2

Change-Id: I48ce974b89f8a77cec17c715fc8e7294872b06cd

23 months agoMerge "Disable XOM in libjni_jpegstream."
Ivan Lozano [Fri, 30 Nov 2018 08:17:55 +0000 (00:17 -0800)]
Merge "Disable XOM in libjni_jpegstream."
am: e768dafffd

Change-Id: I46b9b51ebf1d3e267cc51176780f92049d36e229

2 years agoMerge "Disable XOM in libjni_jpegstream."
Treehugger Robot [Fri, 30 Nov 2018 02:07:21 +0000 (02:07 +0000)]
Merge "Disable XOM in libjni_jpegstream."

2 years agoDisable XOM in libjni_jpegstream.
Ivan Lozano [Thu, 29 Nov 2018 21:55:52 +0000 (13:55 -0800)]
Disable XOM in libjni_jpegstream.

Disable execute-only memory layouts in libjni_jpegstream.

This relies on libjpeg_static_ndk, which contains some data mixed into
code and thus requires a readable .text.

Bug: 77958880
Test: make -j libjni_jpegstream ENABLE_XOM=true
Test: readelf -l $OUT/system/lib64/libjni_jpegstream.so
Change-Id: I02594082eac9724622bcbeb20f0ae3a2b070b8e3

2 years agoMerge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release
Bill Yi [Thu, 29 Nov 2018 02:34:48 +0000 (18:34 -0800)]
Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release

Change-Id: Ic5ebca15896c2e2ade4012248567e6415178007b

2 years agoSnap for 5115288 from 01fde576280635f38ef49a9251f76d63d4a679be to pi-qpr2-release
android-build-team Robot [Wed, 7 Nov 2018 04:14:56 +0000 (04:14 +0000)]
Snap for 5115288 from 01fde576280635f38ef49a9251f76d63d4a679be to pi-qpr2-release

Change-Id: I248417c89ffb886474b3f0f6655490d869155f17

2 years ago[automerger skipped] Import translations. DO NOT MERGE am: 01fde57628 -s ours
Bill Yi [Fri, 2 Nov 2018 19:59:38 +0000 (12:59 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am: 01fde57628  -s ours
am: 2dd43a115c  -s ours

Change-Id: Ia829d04f4c1133799d380427acd01549583d6a41

2 years ago[automerger skipped] Import translations. DO NOT MERGE
Bill Yi [Fri, 2 Nov 2018 19:48:46 +0000 (12:48 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am: 01fde57628  -s ours

Change-Id: If44a3a9e9da85fe19b5ccbfd0755b3855d64aa14

2 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 2 Nov 2018 17:48:55 +0000 (10:48 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ia3e0df818eb5bba4c72a604d5f37168d0034c189

2 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 25 Oct 2018 13:33:27 +0000 (06:33 -0700)]
Import translations. DO NOT MERGE

Change-Id: I047a799cd718db86a96d7cda9651bf2ce4bae886
Auto-generated-cl: translation import

2 years ago[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am...
Bill Yi [Thu, 25 Oct 2018 02:19:10 +0000 (19:19 -0700)]
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: fe3dc60034  -s ours am: 14d8f2eddb  -s ours
am: 636249a29b  -s ours

Change-Id: I3efb8dae122c911cc17d830acc85c70c19eb1647

2 years ago[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am...
Bill Yi [Thu, 25 Oct 2018 01:51:12 +0000 (18:51 -0700)]
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: fe3dc60034  -s ours
am: 14d8f2eddb  -s ours

Change-Id: I399151098147d4af08c2a67643db0b7f5db6f8a7

2 years ago[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
Bill Yi [Wed, 24 Oct 2018 23:30:55 +0000 (16:30 -0700)]
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
am: fe3dc60034  -s ours

Change-Id: I9561fe4a350cc651e34f599eb83ffbd28ec0650a

2 years agoMerge pie-platform-release to aosp-master - DO NOT MERGE
Bill Yi [Wed, 24 Oct 2018 21:47:23 +0000 (14:47 -0700)]
Merge pie-platform-release to aosp-master - DO NOT MERGE

Change-Id: I1df9af0c77452b21a6424bb3c82f340779fd2439

2 years ago[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE...
Bill Yi [Wed, 24 Oct 2018 17:12:41 +0000 (10:12 -0700)]
[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 346d27382b  -s ours
am: 11bf4ed50b  -s ours

Change-Id: I52c7c0c370c9173397e48f5cfca7557d3b80cb43

2 years ago[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
Bill Yi [Wed, 24 Oct 2018 16:55:02 +0000 (09:55 -0700)]
[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
am: 346d27382b  -s ours

Change-Id: I4af2cb2250e48423166e9a80afbc2019d7df72e1

2 years agoMerge pi-platform-release to stage-aosp-master - DO NOT MERGE
Bill Yi [Wed, 24 Oct 2018 16:07:10 +0000 (09:07 -0700)]
Merge pi-platform-release to stage-aosp-master - DO NOT MERGE

Change-Id: I07a877737f9d78fb6e661a0d73b2b6597e7b944a

2 years ago[automerger skipped] Import translations. DO NOT MERGE am: 1a2403bd8f -s ours
Bill Yi [Sun, 14 Oct 2018 03:07:14 +0000 (20:07 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am: 1a2403bd8f  -s ours
am: 537139be50  -s ours

Change-Id: Idff23c609483f5385fa4cd60a6603bbfbda54afa

2 years ago[automerger skipped] Import translations. DO NOT MERGE
Bill Yi [Sun, 14 Oct 2018 03:02:38 +0000 (20:02 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am: 1a2403bd8f  -s ours

Change-Id: I20a0d53f832c19dfe58d9035af4f41a2d7b3bc1c

2 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 13 Oct 2018 15:27:35 +0000 (08:27 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ib12f5c9f2739a808b44a5d39812aeec8f9511bad
Auto-generated-cl: translation import

2 years agoMerge stage-dr1-aosp-master into stage-aosp-master am: 4a1070631d
Xin Li [Tue, 14 Aug 2018 01:40:06 +0000 (18:40 -0700)]
Merge stage-dr1-aosp-master into stage-aosp-master am: 4a1070631d
am: b183e8719d

Change-Id: Ic47ece8f4d262c4095a66ad80db7a4d9079292b8

2 years agoMerge stage-dr1-aosp-master into stage-aosp-master
Xin Li [Tue, 14 Aug 2018 00:34:03 +0000 (17:34 -0700)]
Merge stage-dr1-aosp-master into stage-aosp-master
am: 4a1070631d

Change-Id: Ibb1ff890d503003aadde778d308c5918b8a7f06e

2 years agoMerge stage-dr1-aosp-master into stage-aosp-master
Xin Li [Mon, 13 Aug 2018 20:01:17 +0000 (13:01 -0700)]
Merge stage-dr1-aosp-master into stage-aosp-master

Bug: 112535855
Change-Id: I3626845eacae13ff02f110290b2bb063c992fcd1

2 years agoMerge "Merge Android Pie into master" am: 3aeae62112 am: 9559bbb3a8 am: 89a4d6cc62
Xin Li [Wed, 8 Aug 2018 10:31:23 +0000 (03:31 -0700)]
Merge "Merge Android Pie into master" am: 3aeae62112 am: 9559bbb3a8 am: 89a4d6cc62
am: 8bbfa8fee2

Change-Id: I679ae1d333b1e6455523fbe3eef6deacb3b677d7

2 years agoMerge "Merge Android Pie into master" am: 3aeae62112 am: 9559bbb3a8
Xin Li [Wed, 8 Aug 2018 05:43:49 +0000 (22:43 -0700)]
Merge "Merge Android Pie into master" am: 3aeae62112 am: 9559bbb3a8
am: 89a4d6cc62

Change-Id: Iad425432d5969d9556aa0c23258bb204f7cd2d49

2 years agoMerge "Merge Android Pie into master" am: 3aeae62112
Xin Li [Wed, 8 Aug 2018 01:28:23 +0000 (18:28 -0700)]
Merge "Merge Android Pie into master" am: 3aeae62112
am: 9559bbb3a8

Change-Id: I66d492a7ce6844b69f93bcc929cc143454467e54

2 years agoMerge "Merge Android Pie into master"
Xin Li [Tue, 7 Aug 2018 21:56:57 +0000 (14:56 -0700)]
Merge "Merge Android Pie into master"
am: 3aeae62112

Change-Id: I650c127623af5f5b4e9b19949a660b24e033fa7d

2 years agoMerge "Merge Android Pie into master"
Xin Li [Tue, 7 Aug 2018 16:51:27 +0000 (16:51 +0000)]
Merge "Merge Android Pie into master"

2 years agoMerge Android Pie into master
Xin Li [Mon, 6 Aug 2018 23:51:19 +0000 (16:51 -0700)]
Merge Android Pie into master

Bug: 112104996
Change-Id: Ic12d3fab61c0ee634f0a98ff9121e97e9cafff18

2 years ago[automerger skipped] Import translations. DO NOT MERGE am: 36d0f3141d -s ours am...
Bill Yi [Sat, 4 Aug 2018 14:28:50 +0000 (07:28 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am: 36d0f3141d  -s ours am: 07980f3a2f  -s ours
am: b174182d7a  -s ours

Change-Id: I31d03c901fad841675a676532268836b15c7b8af

2 years ago[automerger skipped] Import translations. DO NOT MERGE am: 36d0f3141d -s ours
Bill Yi [Sat, 4 Aug 2018 14:24:23 +0000 (07:24 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am: 36d0f3141d  -s ours
am: 07980f3a2f  -s ours

Change-Id: I5c4b515043fe29cb99be33e2537128222ca57cd9

2 years ago[automerger skipped] Import translations. DO NOT MERGE
Bill Yi [Sat, 4 Aug 2018 14:20:21 +0000 (07:20 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am: 36d0f3141d  -s ours

Change-Id: Ic18ff5a653501f7537b3c4eb053103fef2c9b9a5

2 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 4 Aug 2018 12:25:54 +0000 (05:25 -0700)]
Import translations. DO NOT MERGE

Change-Id: I1c17bbf576ffe78d543115068d289c2d3d3718f7
Auto-generated-cl: translation import

2 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 11 Jun 2018 19:13:52 +0000 (19:13 +0000)]
Merge "Import translations. DO NOT MERGE"

2 years ago[automerger skipped] Import translations. DO NOT MERGE am: eb9c436e05 -s ours
Bill Yi [Mon, 11 Jun 2018 18:30:31 +0000 (11:30 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am: eb9c436e05  -s ours
am: 9bb7bf18aa  -s ours

Change-Id: Ic1fb4854be82f98856fe646a7caef7e6809e7191

2 years ago[automerger skipped] Import translations. DO NOT MERGE
Bill Yi [Mon, 11 Jun 2018 18:14:20 +0000 (11:14 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am: eb9c436e05  -s ours

Change-Id: I2301f3720bfbde339c8cdc51b8f31cb6a83b1cf4

2 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 9 Jun 2018 17:53:59 +0000 (10:53 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ieea937ca6017eafa4945b7f7b73f789a14166ef5

2 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 9 Jun 2018 17:52:50 +0000 (10:52 -0700)]
Import translations. DO NOT MERGE

Change-Id: I549bc2c0f61bddd1e2bed43433ea2993b03b145d
Auto-generated-cl: translation import

2 years agoMerge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: d97beba789
Xin Li [Sat, 9 Jun 2018 13:43:46 +0000 (06:43 -0700)]
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: d97beba789
am: fc22942ad6

Change-Id: Ibc7f8c43293bae1bb65aa0831db187fa29ba70d1

2 years agoMerge pi-dev-plus-aosp-without-vendor into stage-aosp-master
Xin Li [Sat, 9 Jun 2018 10:13:44 +0000 (03:13 -0700)]
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: d97beba789

Change-Id: Ib683e84842c6d6899f08756bce932c69374f9f5e