OSDN Git Service
Yao Chen [Tue, 17 Oct 2017 17:37:48 +0000 (17:37 +0000)]
Revert "Revert "Start auto-generating the stats log API.""
Test: builds successfully
This reverts commit
931945399859ab91545ba2c2a914f044092d5e2e.
Change-Id: I22bca4a32adf86040b9d72ad5b45999aba28f586
TreeHugger Robot [Mon, 16 Oct 2017 22:54:43 +0000 (22:54 +0000)]
Merge "Request focus when EditTextPreference opens"
Joe Onorato [Mon, 16 Oct 2017 22:46:21 +0000 (22:46 +0000)]
Merge "Revert "Start auto-generating the stats log API.""
Joe Onorato [Mon, 16 Oct 2017 22:41:28 +0000 (22:41 +0000)]
Revert "Start auto-generating the stats log API."
This reverts commit
b81d1a7b9a38dcb4d356ae3435a82fb52ba7d585.
Change-Id: I189684d8913ffffca42d9514ac88ea5cc4a44f05
Fyodor Kupolov [Mon, 16 Oct 2017 22:15:24 +0000 (22:15 +0000)]
Merge "Added APCT test for SQLiteDatabase"
TreeHugger Robot [Mon, 16 Oct 2017 22:00:34 +0000 (22:00 +0000)]
Merge "Move hyphenator mapping to native code."
TreeHugger Robot [Mon, 16 Oct 2017 21:59:08 +0000 (21:59 +0000)]
Merge "Fix wallpaper placement + performance improvement"
Jason Monk [Mon, 16 Oct 2017 21:37:54 +0000 (21:37 +0000)]
Merge "Auto-dim refinements" into oc-mr1-dev am:
2806975bfb
am:
a739d220fc
Change-Id: I4c0fb646b7f2593cf579b0958fa1222dd1c55864
Yi Jin [Mon, 16 Oct 2017 21:26:25 +0000 (21:26 +0000)]
Merge "Convert proto3 to proto2 to avoid forced zero enum value."
Joe Onorato [Mon, 16 Oct 2017 21:19:16 +0000 (21:19 +0000)]
Merge changes Idf402222,I8eb7e341
* changes:
Start auto-generating the stats log API.
Make bit able to build native tests.
Fan Zhang [Mon, 16 Oct 2017 21:00:14 +0000 (14:00 -0700)]
Request focus when EditTextPreference opens
Change-Id: I2f755f7045836b5e95825029f9a494369a2af109
Fixes:
67759420
Test: robotests
Chih-hung Hsieh [Mon, 16 Oct 2017 20:39:41 +0000 (20:39 +0000)]
Merge "Use -Werror in frameworks/base" am:
16fbd3a1d8 am:
0bfb717a37 am:
9f004b1752
am:
decc397b26
Change-Id: Id4abbc6cb95b2eb96f535b6c1c5295cb27c9d2b0
Yi Jin [Mon, 16 Oct 2017 20:22:34 +0000 (20:22 +0000)]
Merge "Use ProtoOutputStream to strip Pii sensetive fields in incidentd"
Andrii Kulian [Mon, 16 Oct 2017 20:16:34 +0000 (20:16 +0000)]
Merge "DO NOT MERGE: Don't let keyguard to influence orientation when dismissing" into oc-mr1-dev am:
96da027196
am:
4f4d64659a -s ours
Change-Id: Ifc982b4ab344d377494a761fab05cd418261fc33
nharold [Mon, 16 Oct 2017 20:13:19 +0000 (20:13 +0000)]
Merge "Remove getNetworkType() from ServiceState" am:
ce1f9afb84 am:
7edf405cdd am:
a550f85f84
am:
ab6b2db8ed
Change-Id: I936b30270a6e40d83469fb7cc528e94e49141c64
Fyodor Kupolov [Sat, 14 Oct 2017 01:12:23 +0000 (18:12 -0700)]
Added APCT test for SQLiteDatabase
It measures typical CRUD operations and loading rows into the Cursor
Test: SQLiteDatabasePerfTest
Bug:
64262688
Change-Id: Id25f8fcea57a19a8c963c5458591262f4cabbb84
Jason Monk [Mon, 16 Oct 2017 20:02:52 +0000 (20:02 +0000)]
Merge "Auto-dim refinements" into oc-mr1-dev
am:
2806975bfb
Change-Id: Ica3ebd5b227fbe9e4bd4b3699f54176d166f6dda
Chih-hung Hsieh [Mon, 16 Oct 2017 19:50:38 +0000 (19:50 +0000)]
Merge "Use -Werror in frameworks/base" am:
16fbd3a1d8 am:
0bfb717a37
am:
9f004b1752
Change-Id: I6517ee1689b0247caf830a6c3528bfa9bcf91f75
TreeHugger Robot [Mon, 16 Oct 2017 19:37:31 +0000 (19:37 +0000)]
Merge "Auto-dim refinements" into oc-mr1-dev
Chih-hung Hsieh [Mon, 16 Oct 2017 19:35:24 +0000 (19:35 +0000)]
Merge "Use -Werror in frameworks/base" am:
16fbd3a1d8
am:
0bfb717a37
Change-Id: I106827dd37a33cfcd956b2a1a3e48bd09576eadb
Andrii Kulian [Mon, 16 Oct 2017 19:35:20 +0000 (19:35 +0000)]
Merge "DO NOT MERGE: Don't let keyguard to influence orientation when dismissing" into oc-mr1-dev
am:
96da027196
Change-Id: I9f263b5fb407dca34d9ba6d60c7296377b7f44bc
TreeHugger Robot [Mon, 16 Oct 2017 19:30:04 +0000 (19:30 +0000)]
Merge "AAPT leave <gradient> alone for VDC"
Chih-hung Hsieh [Mon, 16 Oct 2017 19:24:53 +0000 (19:24 +0000)]
Merge "Use -Werror in frameworks/base"
am:
16fbd3a1d8
Change-Id: Iab69cf4f99cf4bedd12eb7764c773a893bfe5343
Chih-hung Hsieh [Mon, 16 Oct 2017 19:13:22 +0000 (19:13 +0000)]
Merge "Use -Werror in frameworks/base"
nharold [Mon, 16 Oct 2017 19:04:36 +0000 (19:04 +0000)]
Merge "Remove getNetworkType() from ServiceState" am:
ce1f9afb84 am:
7edf405cdd
am:
a550f85f84
Change-Id: If5c714452e56f76bf6f9629444469fda2d45be93
TreeHugger Robot [Mon, 16 Oct 2017 18:56:49 +0000 (18:56 +0000)]
Merge "DO NOT MERGE: Don't let keyguard to influence orientation when dismissing" into oc-mr1-dev
nharold [Mon, 16 Oct 2017 18:52:15 +0000 (18:52 +0000)]
Merge "Remove getNetworkType() from ServiceState" am:
ce1f9afb84
am:
7edf405cdd
Change-Id: I0782f2db112fb1c0e404dc01e9a401268523ad39
nharold [Mon, 16 Oct 2017 18:41:22 +0000 (18:41 +0000)]
Merge "Remove getNetworkType() from ServiceState"
am:
ce1f9afb84
Change-Id: I8e09f9060c7066e99428ea395743f66924443488
nharold [Mon, 16 Oct 2017 18:30:01 +0000 (18:30 +0000)]
Merge "Remove getNetworkType() from ServiceState"
Mathieu Chartier [Mon, 16 Oct 2017 18:14:48 +0000 (18:14 +0000)]
Merge "Add dalvik.vm.foreground-heap-growth-multiplier property" into oc-mr1-dev am:
2baa393238
am:
64a636c8bd
Change-Id: Ic784a133d04aed855a0150eb7597375cc053c0e0
Yi Jin [Fri, 29 Sep 2017 22:29:38 +0000 (15:29 -0700)]
Convert proto3 to proto2 to avoid forced zero enum value.
The rationale for this change:
1. When defining enum values for platform, we want to use the current
integers, in some cases zero is not defined, but proto3 enforces a zero
default value.
2. Android Metrics Team uses proto2 on server-side
3. When copying .proto to server-side, the known issue of dropping
unknown fields might affect if using proto3
4. Not much benefits from using proto3
Bug:
67110257
Test: manully generate incident report and it looks normal
Change-Id: Ia63e39de549a46683e9f80fcb74f1d771782b7f4
Mathieu Chartier [Mon, 16 Oct 2017 18:02:36 +0000 (18:02 +0000)]
Merge "Add dalvik.vm.foreground-heap-growth-multiplier property" into oc-mr1-dev
am:
2baa393238
Change-Id: I5c35bae390870d6582d863e16013afb897117d0b
TreeHugger Robot [Mon, 16 Oct 2017 17:54:39 +0000 (17:54 +0000)]
Merge "Fix parcelling of Kernel Wakelock/reason"
Mathieu Chartier [Mon, 16 Oct 2017 17:49:09 +0000 (17:49 +0000)]
Merge "Add dalvik.vm.foreground-heap-growth-multiplier property" into oc-mr1-dev
ztenghui [Fri, 13 Oct 2017 22:56:08 +0000 (15:56 -0700)]
AAPT leave <gradient> alone for VDC
bug:
62421666
Test: Tested with changes for Gradient of VDC.
Change-Id: I07b39721aeaaafd888416a0f71f6cbd5fce97732
TreeHugger Robot [Mon, 16 Oct 2017 17:12:22 +0000 (17:12 +0000)]
Merge "Throw OOME if Bitmap.nativeCreate fails"
Lucas Dupin [Mon, 2 Oct 2017 18:38:13 +0000 (11:38 -0700)]
Fix wallpaper placement + performance improvement
Wallpaper would have the wrong placement during
first frame because it would be center aligned
in a surface that's not big enough.
Also removed old OpenGl implementation, in favor of new
hardware accelerated canvas.
Change-Id: Ic9c9eaa817e1f6494aa5431d8278f2c28b2c45a9
Fixes:
66926914
Test: set wallpapaer with different offsets, orientations and devices
TreeHugger Robot [Mon, 16 Oct 2017 16:10:19 +0000 (16:10 +0000)]
Merge "[Magnifier - 4] Batch of tweaks"
Winson Chung [Mon, 16 Oct 2017 16:07:09 +0000 (16:07 +0000)]
Merge "Fix regression from ag/
2987716"
Jason Monk [Fri, 13 Oct 2017 14:34:40 +0000 (10:34 -0400)]
Auto-dim refinements
- Don't auto-dim while wallpaper is showing
- Up alpha to 60%
Change-Id: Ie5fc33279ca46f7de37befacbbd7b42b7d4e5d15
Fixes:
67735001
Test: manual
Andrei Stingaceanu [Fri, 13 Oct 2017 15:41:28 +0000 (16:41 +0100)]
[Magnifier - 4] Batch of tweaks
* magnifier zoom from 1.5 to 1.25
* max scale from 10 to 4
* magnifier shows over the text if there is no more space above
instead of showing underneath the cursor
* paused the blink while showing the magnifier and resumed when
dismissing
Bug:
63531115
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Test: manual test that shows the magnifier working
Change-Id: Ief3e0b7dc9e287e7dd1a9102548b1861598b69c4
Bill Yi [Mon, 16 Oct 2017 06:33:32 +0000 (06:33 +0000)]
Merge "Import translations. DO NOT MERGE am:
b081f1e809 -s ours am:
43b03fbacf -s ours am:
7e3f20e249 -s ours am:
b597ff837c -s ours am:
9336d62dcf -s ours" into oc-mr1-dev-plus-aosp
am:
28aeb5185f -s ours
Change-Id: I35663e31a17361df371c34f04665085d6d20ac27
Bill Yi [Mon, 16 Oct 2017 06:26:28 +0000 (06:26 +0000)]
Import translations. DO NOT MERGE am:
b081f1e809 -s ours am:
43b03fbacf -s ours am:
7e3f20e249 -s ours am:
b597ff837c -s ours am:
9848c0af2c -s ours
am:
ffc344e708 -s ours
Change-Id: Ice35ca305f98ed3d1b9002fd22a96a6f7960e472
Android Build Merger (Role) [Mon, 16 Oct 2017 06:21:11 +0000 (06:21 +0000)]
Merge "Import translations. DO NOT MERGE am:
b081f1e809 -s ours am:
43b03fbacf -s ours am:
7e3f20e249 -s ours am:
b597ff837c -s ours am:
9336d62dcf -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Mon, 16 Oct 2017 06:17:10 +0000 (06:17 +0000)]
Import translations. DO NOT MERGE am:
b081f1e809 -s ours am:
43b03fbacf -s ours am:
7e3f20e249 -s ours am:
b597ff837c -s ours
am:
9336d62dcf -s ours
Change-Id: Ic8d359bb94ed77d0f2f868a9d0705ecbe694559c
Bill Yi [Mon, 16 Oct 2017 06:16:00 +0000 (06:16 +0000)]
Import translations. DO NOT MERGE am:
b081f1e809 -s ours am:
43b03fbacf -s ours am:
7e3f20e249 -s ours am:
b597ff837c -s ours
am:
9848c0af2c -s ours
Change-Id: I1797f216c7790fc672f957c109ae710886d2bd83
Bill Yi [Mon, 16 Oct 2017 06:07:55 +0000 (06:07 +0000)]
Import translations. DO NOT MERGE am:
b081f1e809 -s ours am:
43b03fbacf -s ours am:
7e3f20e249 -s ours
am:
b597ff837c -s ours
Change-Id: I23c9353f7d29150b47822f1a524b46a835e6ba77
Bill Yi [Mon, 16 Oct 2017 06:07:55 +0000 (06:07 +0000)]
Import translations. DO NOT MERGE am:
b081f1e809 -s ours am:
43b03fbacf -s ours am:
7e3f20e249 -s ours
am:
b597ff837c -s ours
Change-Id: I4372cfb4a6dc243e9915d40f147a38119e4d1666
Bill Yi [Mon, 16 Oct 2017 05:59:25 +0000 (05:59 +0000)]
Import translations. DO NOT MERGE am:
b081f1e809 -s ours am:
43b03fbacf -s ours
am:
7e3f20e249 -s ours
Change-Id: I81957a7142c7ee4f702e4895bdfebdb190750367
Bill Yi [Mon, 16 Oct 2017 05:48:58 +0000 (05:48 +0000)]
Import translations. DO NOT MERGE am:
b081f1e809 -s ours
am:
43b03fbacf -s ours
Change-Id: If3ad876fdb726d199a8ccc26a1808f358377e44b
Bill Yi [Mon, 16 Oct 2017 05:41:21 +0000 (05:41 +0000)]
Import translations. DO NOT MERGE
am:
b081f1e809 -s ours
Change-Id: I8589e76f2f5197beefddb2027261e290932d268f
Mathieu Chartier [Mon, 16 Oct 2017 04:13:28 +0000 (21:13 -0700)]
Add dalvik.vm.foreground-heap-growth-multiplier property
Corresponds to the -XX:ForegroundHeapGrowthMultiplier ART option.
Bug:
67416130
Test: make, flash, setprop
Change-Id: Ia9c70c62d8faa3b9aeb7b50dba237095abd53e80
Joe Onorato [Mon, 16 Oct 2017 03:04:42 +0000 (20:04 -0700)]
Start auto-generating the stats log API.
Both native and java bindings.
TODOs:
- Finish WorkSources.
- Clean up the package names for the protos.
- Put the protos in a more suitable location.
Test: stats-log-api-gen-test
Change-Id: Idf4022225e2be05106dbcf7de8e97a3337fc63e2
Joe Onorato [Thu, 12 Oct 2017 07:16:10 +0000 (00:16 -0700)]
Make bit able to build native tests.
It still can't run them. That's a lot of work.
Test: bit statsd_test
Change-Id: I8eb7e341956e698b4e5d110924f78f0485e02f67
TreeHugger Robot [Sun, 15 Oct 2017 20:37:21 +0000 (20:37 +0000)]
Merge "Removes redundant RefBase inheritance."
Bill Yi [Sun, 15 Oct 2017 20:13:44 +0000 (13:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id17cd2d22442f7bf1221be8f98164189757695a4
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Pankaj Kanwar [Sun, 15 Oct 2017 06:07:33 +0000 (06:07 +0000)]
Merge "Add CarrierConfig for Invalid Call Forwarding number" into oc-mr1-dev am:
7c18f52452
am:
5c0982c604
Change-Id: Ib075510a7e3f7ad5fe17f7dea065f1dd42328d16
Pankaj Kanwar [Sun, 15 Oct 2017 04:21:34 +0000 (04:21 +0000)]
Merge "Add CarrierConfig for Invalid Call Forwarding number" into oc-mr1-dev
am:
7c18f52452
Change-Id: I12c3b3e3a0d4ad4919df5daeb07367f6197ffa93
Pankaj Kanwar [Sun, 15 Oct 2017 04:03:46 +0000 (04:03 +0000)]
Merge "Add CarrierConfig for Invalid Call Forwarding number" into oc-mr1-dev
Tobias Thierer [Sun, 15 Oct 2017 03:54:47 +0000 (03:54 +0000)]
Merge "Update locked_region_code_injection tool to ASM 6.0-BETA." am:
26817938f6 am:
e69366ff27 am:
8e60defe4b
am:
b5a80794bb
Change-Id: I4508affe416099033cc497db5fb1894e48a9726e
Wileen Chiu [Sun, 15 Oct 2017 03:46:49 +0000 (03:46 +0000)]
Merge "Add change to show Invalid card when erroneous card is inserted." am:
4bc825aecc am:
8279494137 am:
9778539847
am:
8463b91dca
Change-Id: I01a3b8fe7e3a679f560a2e2d03d39b1d0b58fa2f
Hugo Benichi [Sun, 15 Oct 2017 03:39:01 +0000 (03:39 +0000)]
Merge "Fix ConnectivityServiceTest#testNetworkCallbackMaximum" am:
d098328585 am:
104b2bcc79 am:
4071792cce
am:
e4cf6229f7
Change-Id: I65c210d8f0ee27540339233d45def0c464920aea
Colin Cross [Sun, 15 Oct 2017 03:30:06 +0000 (03:30 +0000)]
Merge "Convert ext.jar to Android.bp" am:
42156f3e56 am:
8feea076a2 am:
faededa6af
am:
3f6bef874e
Change-Id: Icb72ff3997c59a605f7339014b48c8eb4ee13795
Tobias Thierer [Sun, 15 Oct 2017 03:18:47 +0000 (03:18 +0000)]
Merge "Update locked_region_code_injection tool to ASM 6.0-BETA." am:
26817938f6 am:
e69366ff27
am:
8e60defe4b
Change-Id: Ic425066feb4288c37154d8b0c487aeda93a6ac59
Mathieu Chartier [Sun, 15 Oct 2017 03:17:12 +0000 (03:17 +0000)]
Merge "Add property reading logic for dalvik.vm.madvise-random" into oc-mr1-dev am:
a354ec973d
am:
ecc8bdc227
Change-Id: I401df22e24210ac7aa47f5a8341f657403ebdece
Wileen Chiu [Sun, 15 Oct 2017 03:11:37 +0000 (03:11 +0000)]
Merge "Add change to show Invalid card when erroneous card is inserted." am:
4bc825aecc am:
8279494137
am:
9778539847
Change-Id: Ie5915e645a4e7a35fd934f54d6d3bf25ad4fcca3
Winston Man [Sun, 15 Oct 2017 03:08:12 +0000 (03:08 +0000)]
Merge "Update CtsShim with multiArch" into oc-mr1-dev am:
0d2d6b6a86
am:
865c5fef38
Change-Id: I6691bb658052abcd3c8332019558b056312acb8c
Zhi An Ng [Sun, 15 Oct 2017 03:03:06 +0000 (03:03 +0000)]
Merge "Only show dialog if top app is killed" into oc-mr1-dev am:
4018898ae4
am:
22681dc903
Change-Id: I61d2d40eb473022222ca1e6aff4c5a2487dec29f
Hugo Benichi [Sun, 15 Oct 2017 02:53:58 +0000 (02:53 +0000)]
Merge "Fix ConnectivityServiceTest#testNetworkCallbackMaximum" am:
d098328585 am:
104b2bcc79
am:
4071792cce
Change-Id: Id5ee94ae9a7e2a92289f2b25b0d5c0f0b5b7381a
Tobias Thierer [Sun, 15 Oct 2017 02:53:45 +0000 (02:53 +0000)]
Merge "Update locked_region_code_injection tool to ASM 6.0-BETA." am:
26817938f6
am:
e69366ff27
Change-Id: Ieac3aadb7674ec63d4eed3d4d52f833e46d4a3a0
Abodunrinwa Toki [Sun, 15 Oct 2017 02:49:47 +0000 (02:49 +0000)]
Merge "Flags to enable/disable smart selection in EditText" into oc-mr1-dev am:
14ba6e10c0
am:
2a86655b42 -s ours
Change-Id: Id0c3f6299e09e13811426e787893417dcc48ef17
Wileen Chiu [Sun, 15 Oct 2017 02:47:23 +0000 (02:47 +0000)]
Merge "Add change to show Invalid card when erroneous card is inserted." am:
4bc825aecc
am:
8279494137
Change-Id: Ibd676d4d0f7b8d285c8c01769dc0686358f3a13d
Mathieu Chartier [Sun, 15 Oct 2017 02:43:19 +0000 (02:43 +0000)]
Merge "Add android.os.Parcel$ReadWriteHelper to compiled classes" into oc-mr1-dev am:
5b4d0e0404
am:
ba714b38a2
Change-Id: I4d827ef35fe511adb05ffca18e7da0d06218d414
Colin Cross [Sun, 15 Oct 2017 02:43:13 +0000 (02:43 +0000)]
Merge "Convert ext.jar to Android.bp" am:
42156f3e56 am:
8feea076a2
am:
faededa6af
Change-Id: I9e640ea1f6175306c74075e25485bce622d6ca52
Hugo Benichi [Sun, 15 Oct 2017 02:38:58 +0000 (02:38 +0000)]
Merge "Fix ConnectivityServiceTest#testNetworkCallbackMaximum" am:
d098328585
am:
104b2bcc79
Change-Id: Ie935c7df75b95afff7b2817df35afe4798e91813
Tobias Thierer [Sun, 15 Oct 2017 02:38:05 +0000 (02:38 +0000)]
Merge "Update locked_region_code_injection tool to ASM 6.0-BETA."
am:
26817938f6
Change-Id: I193d04b7a4ebf0f39f60ac275a7eeb93499ded9d
Wileen Chiu [Sun, 15 Oct 2017 02:32:25 +0000 (02:32 +0000)]
Merge "Add change to show Invalid card when erroneous card is inserted."
am:
4bc825aecc
Change-Id: I89a5b529033c30defacc715ef3c8310500e5fae7
Mathieu Chartier [Sun, 15 Oct 2017 02:31:19 +0000 (02:31 +0000)]
Merge "Add property reading logic for dalvik.vm.madvise-random" into oc-mr1-dev
am:
a354ec973d
Change-Id: Ic75411af539a08e215b5c9e076688fd39b46569d
Hugo Benichi [Sun, 15 Oct 2017 02:24:52 +0000 (02:24 +0000)]
Merge "Fix ConnectivityServiceTest#testNetworkCallbackMaximum"
am:
d098328585
Change-Id: I1cbe45eb339903630675713d287e3375c7c98e62
Winston Man [Sun, 15 Oct 2017 02:22:06 +0000 (02:22 +0000)]
Merge "Update CtsShim with multiArch" into oc-mr1-dev
am:
0d2d6b6a86
Change-Id: Idcaf213ed1e081c816f1e6a8fa8a1650f6b04265
Colin Cross [Sun, 15 Oct 2017 02:19:40 +0000 (02:19 +0000)]
Merge "Convert ext.jar to Android.bp" am:
42156f3e56
am:
8feea076a2
Change-Id: I7db0fc0e79fdc0301f80b45c2001ec55031b137e
Zhi An Ng [Sun, 15 Oct 2017 02:17:20 +0000 (02:17 +0000)]
Merge "Only show dialog if top app is killed" into oc-mr1-dev
am:
4018898ae4
Change-Id: I01bb75704d262cccce0f97aeb13de2ba02ace2f0
Abodunrinwa Toki [Sun, 15 Oct 2017 02:11:46 +0000 (02:11 +0000)]
Merge "Flags to enable/disable smart selection in EditText" into oc-mr1-dev
am:
14ba6e10c0
Change-Id: I0ddb7b827ad8b0be37c7e1adc5a95493bd35d61f
Patrik Torstensson [Sun, 15 Oct 2017 02:09:14 +0000 (02:09 +0000)]
Merge "Incorporate slab reclaimable into meminfo" into oc-mr1-dev am:
20fb01eb23
am:
7528452f57
Change-Id: I46c0b4b07044578fe300aaf587973a650628388b
Colin Cross [Sun, 15 Oct 2017 02:06:20 +0000 (02:06 +0000)]
Merge "Convert ext.jar to Android.bp"
am:
42156f3e56
Change-Id: I44443e9095c8b527ebb42d11a6f5369fdf3e5d05
Mathieu Chartier [Sun, 15 Oct 2017 02:06:02 +0000 (02:06 +0000)]
Merge "Add android.os.Parcel$ReadWriteHelper to compiled classes" into oc-mr1-dev
am:
5b4d0e0404
Change-Id: I08773b81acdf9f7c16be246ba056b9f8f54b4e6c
Pankaj Kanwar [Sun, 15 Oct 2017 02:02:47 +0000 (02:02 +0000)]
Merge "Merge "Cleanup of Cellular/Wifi aggregate statistics" into oc-mr1-dev am:
eb98edfb83" into oc-mr1-dev-plus-aosp
am:
c623db3d98
Change-Id: I5512c904eb29e2819358299df36f7a1c2c261992
TreeHugger Robot [Sat, 14 Oct 2017 19:44:53 +0000 (19:44 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Sat, 14 Oct 2017 03:21:50 +0000 (03:21 +0000)]
Merge "Add signature permission to allow access to shortcuts for sysui"
TreeHugger Robot [Sat, 14 Oct 2017 02:40:16 +0000 (02:40 +0000)]
Merge "AAPT2: Flatten AndroidManifest.xml stringpool in UTF16"
Bill Yi [Sat, 14 Oct 2017 01:17:32 +0000 (18:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I11e09d4501fed09201362b2fb4d194330c5a72e2
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Zhizhou Yang [Sat, 14 Oct 2017 01:13:55 +0000 (01:13 +0000)]
Merge "Enable PGO for hwui"
Makoto Onuki [Sat, 14 Oct 2017 00:10:48 +0000 (17:10 -0700)]
Add signature permission to allow access to shortcuts for sysui
Bug
34715012
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest1 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest2 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest3 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest4 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest5 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest6 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest7 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest8 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest9 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest10 -w com.android.frameworks.servicestests
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsShortcutManagerTestCases
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsShortcutHostTestCases
Change-Id: I922f9fb872e27b25d1016b3894165a0e63faa9b5
TreeHugger Robot [Sat, 14 Oct 2017 00:20:23 +0000 (00:20 +0000)]
Merge "Remove WifiNetworkScoreCache fake"
Winson Chung [Sat, 14 Oct 2017 00:18:58 +0000 (17:18 -0700)]
Fix regression from ag/
2987716
- Removing some tasks can trigger the list to be updated (for the removed
task), ensure that we iterate the list backwards so that iteration is
not affected by any removed tasks.
Bug:
67785147
Test: Just reverting some code
Change-Id: If8afc222f62656cbf5404bcf79c70833514103e7
Signed-off-by: Winson Chung <winsonc@google.com>
Winson Chung [Fri, 13 Oct 2017 23:45:55 +0000 (23:45 +0000)]
Merge changes Id963434f,I103ccc69,I770cd430
* changes:
Remove events bus code from task loading code.
Pull out TaskStackListener into its own class.
Remove unused recents fast-toggle/paging code.
TreeHugger Robot [Fri, 13 Oct 2017 23:39:18 +0000 (23:39 +0000)]
Merge "PowerUI: Update temperature warnings on thermal throttling events"
Chih-Hung Hsieh [Tue, 3 Oct 2017 16:57:55 +0000 (09:57 -0700)]
Use -Werror in frameworks/base
* Fix unused variable and return value warnings.
Bug:
66996870
Test: build with WITH_TIDY=1
Change-Id: I890e65a20848d00559ba5a4f9691be1347b456af
Calin Juravle [Fri, 13 Oct 2017 22:59:06 +0000 (22:59 +0000)]
Merge "[framework] Add check that classpath is up to date to getDexOptNeeded"
Seigo Nonaka [Mon, 9 Oct 2017 18:10:24 +0000 (11:10 -0700)]
Move hyphenator mapping to native code.
This CL contains the following changes:
- Replace Hyphenator mapping in Java with minikin::HyphenatorMap.
- Remove locale tracking code from StaticLayout.java
- Stop creating Hyphenator pointer array in StaticLayout.
Bug:
65024629
Bug:
67319341
Test: bit CtsTextTestCases:*
Test: bit FrameworksCoreTests:android.text.
Test: bit FrameworksCoreTests:android.widget.TextViewTest
Change-Id: Ib88c8e816c70959057abe296cc434ddb70bc397a
OSDN Git Service
