Abodunrinwa Toki
786188536f
Easy switching of logging for TextClassifier
...
This way there is a single switch for detailed logging vs summarised
logging. We can keep the switch on in development but limit the logs
in production devices.
Test: manually tested log switch turned on/off.
Change-Id: I8ad291b19554f393a05fbc7cae3d545163d21a99
2017-10-17 15:35:44 +01:00
Yi Jin
0751b7249c
Merge "Convert proto3 to proto2 to avoid forced zero enum value."
2017-10-16 21:26:25 +00:00
Joe Onorato
22910ada9a
Merge changes Idf402222,I8eb7e341
...
* changes:
Start auto-generating the stats log API.
Make bit able to build native tests.
2017-10-16 21:19:16 +00:00
Chih-hung Hsieh
e1e0785c38
Merge "Use -Werror in frameworks/base" am: 16fbd3a1d8 am: 0bfb717a37 am: 9f004b1752
...
am: decc397b26
2017-10-16 20:39:41 +00:00
Yi Jin
7215f94401
Merge "Use ProtoOutputStream to strip Pii sensetive fields in incidentd"
2017-10-16 20:22:34 +00:00
Andrii Kulian
78a9d15368
Merge "DO NOT MERGE: Don't let keyguard to influence orientation when dismissing" into oc-mr1-dev am: 96da027196
...
am: 4f4d64659a
2017-10-16 20:16:34 +00:00
nharold
2184fb285d
Merge "Remove getNetworkType() from ServiceState" am: ce1f9afb84 am: 7edf405cdd am: a550f85f84
...
am: ab6b2db8ed
2017-10-16 20:13:19 +00:00
Chih-hung Hsieh
decc397b26
Merge "Use -Werror in frameworks/base" am: 16fbd3a1d8 am: 0bfb717a37
...
am: 9f004b1752
2017-10-16 19:50:38 +00:00
Chih-hung Hsieh
9f004b1752
Merge "Use -Werror in frameworks/base" am: 16fbd3a1d8
...
am: 0bfb717a37
2017-10-16 19:35:24 +00:00
Andrii Kulian
4f4d64659a
Merge "DO NOT MERGE: Don't let keyguard to influence orientation when dismissing" into oc-mr1-dev
...
am: 96da027196
2017-10-16 19:35:20 +00:00
TreeHugger Robot
f4165c4cf7
Merge "AAPT leave <gradient> alone for VDC"
2017-10-16 19:30:04 +00:00
Chih-hung Hsieh
0bfb717a37
Merge "Use -Werror in frameworks/base"
...
am: 16fbd3a1d8
2017-10-16 19:24:53 +00:00
Chih-hung Hsieh
16fbd3a1d8
Merge "Use -Werror in frameworks/base"
2017-10-16 19:13:22 +00:00
nharold
ab6b2db8ed
Merge "Remove getNetworkType() from ServiceState" am: ce1f9afb84 am: 7edf405cdd
...
am: a550f85f84
2017-10-16 19:04:36 +00:00
TreeHugger Robot
96da027196
Merge "DO NOT MERGE: Don't let keyguard to influence orientation when dismissing" into oc-mr1-dev
2017-10-16 18:56:49 +00:00
nharold
a550f85f84
Merge "Remove getNetworkType() from ServiceState" am: ce1f9afb84
...
am: 7edf405cdd
2017-10-16 18:52:15 +00:00
nharold
7edf405cdd
Merge "Remove getNetworkType() from ServiceState"
...
am: ce1f9afb84
2017-10-16 18:41:22 +00:00
nharold
ce1f9afb84
Merge "Remove getNetworkType() from ServiceState"
2017-10-16 18:30:01 +00:00
Mathieu Chartier
00d31c2760
Merge "Add dalvik.vm.foreground-heap-growth-multiplier property" into oc-mr1-dev am: 2baa393238
...
am: 64a636c8bd
2017-10-16 18:14:48 +00:00
Yi Jin
c7f93070b6
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
2017-10-16 11:04:01 -07:00
Mathieu Chartier
64a636c8bd
Merge "Add dalvik.vm.foreground-heap-growth-multiplier property" into oc-mr1-dev
...
am: 2baa393238
2017-10-16 18:02:36 +00:00
TreeHugger Robot
19777ff1d1
Merge "Fix parcelling of Kernel Wakelock/reason"
2017-10-16 17:54:39 +00:00
Mathieu Chartier
2baa393238
Merge "Add dalvik.vm.foreground-heap-growth-multiplier property" into oc-mr1-dev
2017-10-16 17:49:09 +00:00
ztenghui
ab2a38c03d
AAPT leave <gradient> alone for VDC
...
bug: 62421666
Test: Tested with changes for Gradient of VDC.
Change-Id: I07b39721aeaaafd888416a0f71f6cbd5fce97732
2017-10-16 10:34:27 -07:00
TreeHugger Robot
959516a885
Merge "Throw OOME if Bitmap.nativeCreate fails"
2017-10-16 17:12:22 +00:00
TreeHugger Robot
0b57d2f561
Merge "[Magnifier - 4] Batch of tweaks"
2017-10-16 16:10:19 +00:00
Winson Chung
5ef215c7cc
Merge "Fix regression from ag/2987716"
2017-10-16 16:07:09 +00:00
Andrei Stingaceanu
451f947ffa
[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
2017-10-16 11:53:52 +01:00
Bill Yi
a512d331ff
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
2017-10-16 06:33:32 +00:00
Bill Yi
9250a56f3a
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
2017-10-16 06:26:28 +00:00
Android Build Merger (Role)
28aeb5185f
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
2017-10-16 06:21:11 +00:00
Bill Yi
94f1e57e7a
Import translations. DO NOT MERGE am: b081f1e809 -s ours am: 43b03fbacf -s ours am: 7e3f20e249 -s ours am: b597ff837c -s ours
...
am: 9336d62dcf
2017-10-16 06:17:10 +00:00
Bill Yi
ffc344e708
Import translations. DO NOT MERGE am: b081f1e809 -s ours am: 43b03fbacf -s ours am: 7e3f20e249 -s ours am: b597ff837c -s ours
...
am: 9848c0af2c
2017-10-16 06:16:00 +00:00
Bill Yi
9336d62dcf
Import translations. DO NOT MERGE am: b081f1e809 -s ours am: 43b03fbacf -s ours am: 7e3f20e249 -s ours
...
am: b597ff837c
2017-10-16 06:07:55 +00:00
Bill Yi
9848c0af2c
Import translations. DO NOT MERGE am: b081f1e809 -s ours am: 43b03fbacf -s ours am: 7e3f20e249 -s ours
...
am: b597ff837c
2017-10-16 06:07:55 +00:00
Bill Yi
b597ff837c
Import translations. DO NOT MERGE am: b081f1e809 -s ours am: 43b03fbacf -s ours
...
am: 7e3f20e249
2017-10-16 05:59:25 +00:00
Bill Yi
7e3f20e249
Import translations. DO NOT MERGE am: b081f1e809 -s ours
...
am: 43b03fbacf
2017-10-16 05:48:58 +00:00
Bill Yi
43b03fbacf
Import translations. DO NOT MERGE
...
am: b081f1e809
2017-10-16 05:41:21 +00:00
Mathieu Chartier
ebc3b4c033
Add dalvik.vm.foreground-heap-growth-multiplier property
...
Corresponds to the -XX:ForegroundHeapGrowthMultiplier ART option.
Bug: 67416130
Test: make, flash, setprop
Change-Id: Ia9c70c62d8faa3b9aeb7b50dba237095abd53e80
2017-10-15 21:31:26 -07:00
Joe Onorato
b81d1a7b9a
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
2017-10-15 20:25:19 -07:00
Joe Onorato
0520afdade
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
2017-10-15 20:25:18 -07:00
TreeHugger Robot
397b51186a
Merge "Removes redundant RefBase inheritance."
2017-10-15 20:37:21 +00:00
Bill Yi
b081f1e809
Import translations. DO NOT MERGE
...
Change-Id: Id17cd2d22442f7bf1221be8f98164189757695a4
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-10-15 13:13:44 -07:00
Pankaj Kanwar
063a2f667e
Merge "Add CarrierConfig for Invalid Call Forwarding number" into oc-mr1-dev am: 7c18f52452
...
am: 5c0982c604
2017-10-15 06:07:33 +00:00
Pankaj Kanwar
5c0982c604
Merge "Add CarrierConfig for Invalid Call Forwarding number" into oc-mr1-dev
...
am: 7c18f52452
2017-10-15 04:21:34 +00:00
Pankaj Kanwar
7c18f52452
Merge "Add CarrierConfig for Invalid Call Forwarding number" into oc-mr1-dev
2017-10-15 04:03:46 +00:00
Tobias Thierer
162fbe7844
Merge "Update locked_region_code_injection tool to ASM 6.0-BETA." am: 26817938f6 am: e69366ff27 am: 8e60defe4b
...
am: b5a80794bb
2017-10-15 03:54:47 +00:00
Wileen Chiu
ca3d1f0cf0
Merge "Add change to show Invalid card when erroneous card is inserted." am: 4bc825aecc am: 8279494137 am: 9778539847
...
am: 8463b91dca
2017-10-15 03:46:49 +00:00
Hugo Benichi
98bee8d32c
Merge "Fix ConnectivityServiceTest#testNetworkCallbackMaximum" am: d098328585 am: 104b2bcc79 am: 4071792cce
...
am: e4cf6229f7
2017-10-15 03:39:01 +00:00
Colin Cross
ad90a766fa
Merge "Convert ext.jar to Android.bp" am: 42156f3e56 am: 8feea076a2 am: faededa6af
...
am: 3f6bef874e
2017-10-15 03:30:06 +00:00
