OSDN Git Service
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
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
Treehugger Robot [Wed, 16 Jan 2019 17:37:32 +0000 (17:37 +0000)]
Merge "Revert "Disable XOM in libjni_jpegstream.""
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
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
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
Chih-hung Hsieh [Tue, 15 Jan 2019 21:57:55 +0000 (21:57 +0000)]
Merge "Add 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
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
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
Anton Hansson [Mon, 14 Jan 2019 09:08:15 +0000 (09:08 +0000)]
Merge "Move 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
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
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
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.""
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
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
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
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."
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
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
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
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
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
Treehugger Robot [Fri, 7 Dec 2018 01:38:20 +0000 (01:38 +0000)]
Merge "DO 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
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
Ivan Lozano [Fri, 30 Nov 2018 08:17:55 +0000 (00:17 -0800)]
Merge "Disable XOM in libjni_jpegstream."
am:
e768dafffd
Change-Id: I46b9b51ebf1d3e267cc51176780f92049d36e229
Treehugger Robot [Fri, 30 Nov 2018 02:07:21 +0000 (02:07 +0000)]
Merge "Disable 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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Xin Li [Tue, 7 Aug 2018 21:56:57 +0000 (14:56 -0700)]
Merge "Merge Android Pie into master"
am:
3aeae62112
Change-Id: I650c127623af5f5b4e9b19949a660b24e033fa7d
Xin Li [Tue, 7 Aug 2018 16:51:27 +0000 (16:51 +0000)]
Merge "Merge 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
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
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
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
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
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
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
Xin Li [Fri, 8 Jun 2018 18:08:00 +0000 (11:08 -0700)]
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
Bug:
79597307
Change-Id: Id6fa79ad43862c576599c72ee5b995104e68de0d
android-build-team Robot [Sun, 27 May 2018 07:24:47 +0000 (07:24 +0000)]
Snap for
4807121 from
742282346a265eebdc0258254050ae42baa24fb2 to pi-release
Change-Id: If37df7dc47d97e088265bc0c8882292e6eb8607c
Bill Yi [Thu, 24 May 2018 23:56:51 +0000 (16:56 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
742282346a -s ours
Change-Id: Ic217b48d7893869967fb5f6deb3aa13602b72aff
Bill Yi [Thu, 24 May 2018 19:06:18 +0000 (12:06 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Idcc558b44475b856b19294c26e719a6fc0ac6a77
Colin Cross [Mon, 7 May 2018 20:34:43 +0000 (13:34 -0700)]
[automerger skipped] Merge "Move Gallery2 over to AAPT2 and new v4 modules" am:
2813902e4e
am:
2324f6d428 -s ours
Change-Id: I5e1792e11ce2bc2e7db1bcefc5b5eff48acb00ba
Colin Cross [Mon, 7 May 2018 19:31:53 +0000 (12:31 -0700)]
Merge "Move Gallery2 over to AAPT2 and new v4 modules"
am:
2813902e4e
Change-Id: If3fc0641e1b6bf319936f451a85f112ef0c61769
Colin Cross [Mon, 7 May 2018 17:53:09 +0000 (17:53 +0000)]
Merge "Move Gallery2 over to AAPT2 and new v4 modules"
android-build-team Robot [Sun, 29 Apr 2018 07:21:10 +0000 (07:21 +0000)]
Snap for
4751833 from
2c756ae525c5a23aeaed791d8afffc9ada381e6d to pi-release
Change-Id: I25b70915d0ba4faf73cb73e30c63efacf5ad7ee5
Bill Yi [Sat, 28 Apr 2018 05:01:26 +0000 (22:01 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
2c756ae525 -s ours
Change-Id: Iee33301222f501bffd89c5e3e03490ca405b71ea
Bill Yi [Sat, 28 Apr 2018 03:05:08 +0000 (20:05 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I8928a7b30341c042d58a3c3c3bf468b07f515074
Colin Cross [Mon, 25 Sep 2017 20:40:55 +0000 (13:40 -0700)]
Move Gallery2 over to AAPT2 and new v4 modules
Bug:
35994894
Test: make
Change-Id: I00cacda9dc8dc9ac919958cc7a8bd432680b85d7
Merged-In: I00cacda9dc8dc9ac919958cc7a8bd432680b85d7
(cherry picked from commit
86f481b8aea757cded9c2179dd5298b291de5e73)
android-build-team Robot [Sun, 8 Apr 2018 07:26:36 +0000 (07:26 +0000)]
Snap for
4706961 from
8d0074b5e5498afbad51b01df7f2e8eecd8d17ee to pi-release
Change-Id: I239f40af9f299e2a688114eb46bea0967901cfd3
Bill Yi [Sat, 7 Apr 2018 03:38:34 +0000 (20:38 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
8d0074b5e5 -s ours
Change-Id: I89a561edb5836a3df2dd6195241eb82417554247
Bill Yi [Fri, 6 Apr 2018 17:54:52 +0000 (10:54 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I7c4761a76fdb9c6f614f1b117bc3d2e38ed7565f
Jiyong Park [Thu, 5 Apr 2018 18:13:12 +0000 (11:13 -0700)]
Merge "Rename android.utils.Pools to com.android.photos.util.Pools" into pi-dev
am:
ab8fa0fe17
Change-Id: Idd42be792d62842226324e120f67cada714c0fdc
TreeHugger Robot [Thu, 5 Apr 2018 17:53:51 +0000 (17:53 +0000)]
Merge "Rename android.utils.Pools to com.android.photos.util.Pools" into pi-dev
Jiyong Park [Thu, 5 Apr 2018 07:12:39 +0000 (16:12 +0900)]
Rename android.utils.Pools to com.android.photos.util.Pools
android.utils.Pools is a class copied from frameworks/base. It was
copied because the framework one has been marked as @hide. This caused
the class to be duplicated into the Gallery2 apk and the boot classpath.
At run-time, the class from bootclasspath was used because the
classloader tries to load a class from the parent class loader first.
However, this combined with the recent activation of the kill-switch
caused a runtime error. Working around the issue by renaming the class
copied into the app so that it does not collide with the
framework-defined one.
Bug:
77544391
Test: build aosp_walleye. Take a video and see it via the Gallery2.
The app does not crash.
Change-Id: Ia0af4da84242044da2e0ab63e38df243d9769418
android-build-team Robot [Tue, 3 Apr 2018 07:23:26 +0000 (07:23 +0000)]
Snap for
4696032 from
915d04b422c527a094ebfb19b4795d353d4ceec7 to pi-release
Change-Id: I28d928a2a05cf99692f95b6979f6dc37994503c8
Bill Yi [Mon, 2 Apr 2018 19:53:33 +0000 (19:53 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
915d04b422 -s ours
Change-Id: I4db6d4eebb8f490a08cfbfcd615818c180e4060f
TreeHugger Robot [Mon, 2 Apr 2018 15:41:16 +0000 (15:41 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Mon, 2 Apr 2018 06:07:12 +0000 (23:07 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I069ba4d8e9ed5ee1b53c1168df08ba26341ecf31
android-build-team Robot [Sun, 1 Apr 2018 07:23:12 +0000 (07:23 +0000)]
Snap for
4693621 from
bb9b24fdcb4008b4367c7d2ecc1f72eec8839b25 to pi-release
Change-Id: Iba8b9d87e8f5c64389f2d60c0cc60a1d887e3c71
Bill Yi [Sat, 31 Mar 2018 04:04:10 +0000 (04:04 +0000)]
[automerger skipped] Import translations. DO NOT MERGE
am:
bb9b24fdcb -s ours
Change-Id: I727e12f4c18c7f6ad5f4f2e6622d8b4186bd68f4
Bill Yi [Fri, 30 Mar 2018 23:54:54 +0000 (16:54 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ibb87be0ac02ded8777d55f0a5aaf1ce4c6531b6e
Aurimas Liutikas [Fri, 30 Mar 2018 17:19:43 +0000 (17:19 +0000)]
Merge "Revert "Revert "Move Gallery2 to androidx.""" into pi-dev
am:
505243ef35
Change-Id: If7793e2bd02074b6daae298b735bce77ff554e49
Aurimas Liutikas [Fri, 30 Mar 2018 13:48:46 +0000 (13:48 +0000)]
Merge "Revert "Revert "Move Gallery2 to androidx.""" into pi-dev
Aurimas Liutikas [Thu, 29 Mar 2018 19:39:49 +0000 (19:39 +0000)]
Revert "Revert "Move Gallery2 to androidx.""
This reverts commit
fac21a096afbe8eb517726cf4f9f093eade87ddc.
We can reland this change now that prebuilts/sdk has been updated with the new SDK. (ag/
3818779)
Bug:
76692459
Change-Id: I73f2ed3d61bc8756d1b7e4ea0e54c58227d5d506
Aurimas Liutikas [Thu, 29 Mar 2018 18:23:30 +0000 (18:23 +0000)]
Merge "Revert "Move Gallery2 to androidx."" into pi-dev
am:
f2f4b814b2
Change-Id: I2d98e71d09ecf1068be60493cebface5dafa55cb
Aurimas Liutikas [Thu, 29 Mar 2018 17:51:17 +0000 (17:51 +0000)]
Merge "Revert "Move Gallery2 to androidx."" into pi-dev
Aurimas Liutikas [Thu, 29 Mar 2018 17:50:33 +0000 (17:50 +0000)]
Revert "Move Gallery2 to androidx."
This reverts commit
c86745dd27fb93baa1ec22796bb4af207b6b6182.
Broke apps target build.
Bug:
76692459
Change-Id: I7b3529a9584d72a31b6c16ff4d4155f75d1c57f8
Aurimas Liutikas [Thu, 29 Mar 2018 17:45:54 +0000 (17:45 +0000)]
Merge "Move Gallery2 to androidx." into pi-dev
am:
0093dbfb7e
Change-Id: I7548d185f7bb9b09a4ccd2de97e4115c535ed5e7
Aurimas Liutikas [Thu, 29 Mar 2018 17:07:41 +0000 (17:07 +0000)]
Merge "Move Gallery2 to androidx." into pi-dev
Bill Yi [Thu, 29 Mar 2018 15:05:13 +0000 (15:05 +0000)]
[automerger skipped] Import translations. DO NOT MERGE
am:
d0b006d0c3 -s ours
Change-Id: I8a345a6ab725c0607254902bbcd0a2e95758a77f
Bill Yi [Thu, 29 Mar 2018 01:03:28 +0000 (18:03 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I6e8f7f82f201970324bb4ab4b377c65adfa2c2cf
Aurimas Liutikas [Wed, 28 Mar 2018 18:45:44 +0000 (11:45 -0700)]
Move Gallery2 to androidx.
Bug:
76692459
Test: make -j Gallery2 and run on emulator
Change-Id: Ife6a5649c21464f404db3198bd6a4ba8aa901ee8
android-build-team Robot [Sun, 4 Mar 2018 08:24:44 +0000 (08:24 +0000)]
Snap for
4632767 from
85b2210bbcb231b4ed2dc158c3a420650098c5de to pi-release
Change-Id: I3fdd0444be422712571c60ee6a4dea173a1d16bb
Bill Yi [Sat, 3 Mar 2018 13:30:06 +0000 (13:30 +0000)]
Import translations. DO NOT MERGE am:
661db9ffb1 -s ours
am:
1608c9536c -s ours
Change-Id: I1f3b6ee3ce978b40ea5b522bddfe946b551f5c13
Bill Yi [Sat, 3 Mar 2018 13:26:07 +0000 (13:26 +0000)]
Import translations. DO NOT MERGE
am:
661db9ffb1 -s ours
Change-Id: I7743a66a3d9672beda62c8d7d40d12c1c39a02d0
TreeHugger Robot [Fri, 2 Mar 2018 21:54:49 +0000 (21:54 +0000)]
Merge "Import translations. DO NOT MERGE"
Andreas Gampe [Fri, 2 Mar 2018 16:48:46 +0000 (16:48 +0000)]
Merge "Gallery2: Fix CollectionIncompatibleType" am:
7115c7cbf9 am:
ae4d8c9a73
am:
c61338150e
Change-Id: I48ff76febe268de8af1b2ccfc8f582e9685f6209
Andreas Gampe [Fri, 2 Mar 2018 16:42:13 +0000 (16:42 +0000)]
Merge "Gallery2: Fix CollectionIncompatibleType" am:
7115c7cbf9
am:
ae4d8c9a73
Change-Id: Ic752304dc8191bf42eba98a7f7f64fd12b13f22d
Andreas Gampe [Fri, 2 Mar 2018 16:35:39 +0000 (16:35 +0000)]
Merge "Gallery2: Fix CollectionIncompatibleType"
am:
7115c7cbf9
Change-Id: I2acf35452fea9973718f971af76dd0964f84423f
Treehugger Robot [Fri, 2 Mar 2018 16:29:55 +0000 (16:29 +0000)]
Merge "Gallery2: Fix CollectionIncompatibleType"
Andreas Gampe [Fri, 2 Mar 2018 01:42:59 +0000 (17:42 -0800)]
Gallery2: Fix CollectionIncompatibleType
Fix incorrect indexOf lookup.
Bug:
73288226
Test: m javac-check RUN_ERROR_PRONE=true
Change-Id: Ifb158d6f4c5f0eb078f9d4fb37c7da03c2c0a4fe
Bill Yi [Fri, 2 Mar 2018 01:20:59 +0000 (17:20 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I7a4084ae93055c588726afffacb83ecb2402b407
Bill Yi [Fri, 2 Mar 2018 01:19:19 +0000 (17:19 -0800)]
Import translations. DO NOT MERGE
Change-Id: I278b784486ae848f4847a32297a10158610dd76f
Auto-generated-cl: translation import
android-build-team Robot [Wed, 21 Feb 2018 08:25:22 +0000 (08:25 +0000)]
Snap for
4613997 from
c111fb81eb6759e6b745aa9888638878407b9076 to pi-release
Change-Id: I581fe1fff30aef853680926761107a9bc2c30b84
OSDN Git Service
