OSDN Git Service
Android Build Merger (Role) [Wed, 22 Nov 2017 02:12:38 +0000 (02:12 +0000)]
Merge "Merge "Javadoc cleanup of IpSecManager API." am:
d09d106ec0 am:
2a82aa70b5 am:
9f6a3431a1"
TreeHugger Robot [Wed, 22 Nov 2017 02:12:14 +0000 (02:12 +0000)]
Merge "Add a wrapper ConfigMetricReportList to hold multiple ConfigMetricReports"
Jonathan Basseri [Wed, 22 Nov 2017 02:10:32 +0000 (02:10 +0000)]
Merge "Javadoc cleanup of IpSecManager API." am:
d09d106ec0 am:
2a82aa70b5
am:
9f6a3431a1
Change-Id: Id10e39da5495f9367332cbc5c754506fc64f3c75
Jonathan Basseri [Wed, 22 Nov 2017 02:00:53 +0000 (02:00 +0000)]
Merge "Javadoc cleanup of IpSecManager API." am:
d09d106ec0
am:
2a82aa70b5
Change-Id: I53e9b3d18fda1122f6a8a6300185c743cc26dbf6
Jonathan Basseri [Wed, 22 Nov 2017 01:51:46 +0000 (01:51 +0000)]
Merge "Javadoc cleanup of IpSecManager API."
am:
d09d106ec0
Change-Id: Iaf206b0980d3bed14fe6b8318d2073577212b460
Suprabh Shukla [Wed, 22 Nov 2017 01:38:26 +0000 (01:38 +0000)]
Merge "Delaying jobs while coming out of doze"
Jonathan Basseri [Wed, 22 Nov 2017 01:32:06 +0000 (01:32 +0000)]
Merge "Javadoc cleanup of IpSecManager API."
TreeHugger Robot [Wed, 22 Nov 2017 01:11:22 +0000 (01:11 +0000)]
Merge "Implement minikin::Run"
TreeHugger Robot [Wed, 22 Nov 2017 01:10:51 +0000 (01:10 +0000)]
Merge "Add very long press to open global actions menu."
TreeHugger Robot [Wed, 22 Nov 2017 00:33:06 +0000 (00:33 +0000)]
Merge "Adds atom when error is written to dropbox."
TreeHugger Robot [Wed, 22 Nov 2017 00:28:44 +0000 (00:28 +0000)]
Merge "Fix NPE with stackless windows."
TreeHugger Robot [Wed, 22 Nov 2017 00:01:12 +0000 (00:01 +0000)]
Merge "The first step towards adding a guardrail."
Malcolm Chen [Tue, 21 Nov 2017 23:40:17 +0000 (23:40 +0000)]
Merge "Provide materials for Mobile network settings UI." am:
8b759f234b -s ours am:
4b7d25e374 -s ours
am:
175b6d2b4a -s ours
Change-Id: I03af1afc1cde03cef74bb8a677e13b318ef01c45
Suprabh Shukla [Fri, 3 Nov 2017 04:23:44 +0000 (21:23 -0700)]
Delaying jobs while coming out of doze
Foreground uids can run their jobs immediately given other constraints
are met. Other jobs will be delayed by 3 seconds when coming out of
doze to ensure imminent user tasks like screen-on can use resources.
Also added an API to allow apps to indicate their job is important to
the user enough that it is allowed to run when the app is in the
foreground or on the temp whitelist regardless of the dozing state of
the device.
Test: cts-tradefed run singleCommand cts-dev -m JobScheduler -t \
android.jobscheduler.cts.DeviceIdleJobsTest
Bug:
64291952
Bug:
64071030
Change-Id: Id52cb4386e683d4f8297e873b3a68c573e5be743
Malcolm Chen [Tue, 21 Nov 2017 23:29:53 +0000 (23:29 +0000)]
Merge "Provide materials for Mobile network settings UI." am:
8b759f234b -s ours
am:
4b7d25e374 -s ours
Change-Id: I71fa4cdd2170bc1ccf39f04f092ea9447f988d1f
Makoto Onuki [Tue, 21 Nov 2017 23:26:55 +0000 (23:26 +0000)]
Merge "Extreme battery saver: Disable launch boost"
Malcolm Chen [Tue, 21 Nov 2017 23:18:13 +0000 (23:18 +0000)]
Merge "Provide materials for Mobile network settings UI."
am:
8b759f234b -s ours
Change-Id: I1e4627084e000f0e3a45005b4a2df34e51fcc0fa
Seigo Nonaka [Wed, 15 Nov 2017 20:06:24 +0000 (12:06 -0800)]
Implement minikin::Run
The minikin::Run is a callback for measuring text piece.
Implement minikin::Run instead of own Run.
This is 2nd attempt of Iec899dc9f91e1af38338dbfd2a8dc5f4cddd3649
Nothing changes from previous CL.
Bug:
65024629
Test: N/A
Change-Id: Ib54a519642cf60aba5d8b5637e679ad903ccd12b
Treehugger Robot [Tue, 21 Nov 2017 23:05:21 +0000 (23:05 +0000)]
Merge "Provide materials for Mobile network settings UI."
tiansiming [Tue, 21 Nov 2017 23:04:44 +0000 (23:04 +0000)]
Merge "Avoid clearing default browser setting when unnecessary" am:
ef32746fc5 am:
3ee9594a27
am:
3c59e35788
Change-Id: Ifd4dcbc6f3ea6473ff212ad46bb8dc8197e3e35d
tiansiming [Tue, 21 Nov 2017 22:49:19 +0000 (22:49 +0000)]
Merge "Avoid clearing default browser setting when unnecessary" am:
ef32746fc5
am:
3ee9594a27
Change-Id: If8d39e9cb350861913deda62b1351d8a4e52607a
tiansiming [Tue, 21 Nov 2017 22:40:35 +0000 (22:40 +0000)]
Merge "Avoid clearing default browser setting when unnecessary"
am:
ef32746fc5
Change-Id: I647c96b9a96612c4745e6ebec5d44cebd6d42767
Treehugger Robot [Tue, 21 Nov 2017 22:22:08 +0000 (22:22 +0000)]
Merge "Avoid clearing default browser setting when unnecessary"
TreeHugger Robot [Tue, 21 Nov 2017 21:51:07 +0000 (21:51 +0000)]
Merge "Add more OWNERS for classes in android.server"
yro [Tue, 21 Nov 2017 00:12:21 +0000 (16:12 -0800)]
Add a wrapper ConfigMetricReportList to hold multiple
ConfigMetricReports
Test: statsd, statsd_test
Change-Id: Ic1ec6e5a31aebb36a1f39a4836e82d97c8be0dfc
David Chen [Tue, 21 Nov 2017 01:25:34 +0000 (17:25 -0800)]
Adds atom when error is written to dropbox.
We log some of the key fields that indicate an error or crash. For
memory reasons, we can't transfer the entire stack trace into statsd.
Test: Manually observed logging while using an app that crashed.
Change-Id: I7085277a22a7ba8642b432998280ef59eb1074b9
TreeHugger Robot [Tue, 21 Nov 2017 21:28:03 +0000 (21:28 +0000)]
Merge "Add OWNERS to system_server services."
Andreas Gampe [Tue, 21 Nov 2017 21:15:20 +0000 (21:15 +0000)]
Merge "PackageManager: Extend cmd interface feedback" am:
d66bc0aaae am:
362a3b9e2a
am:
bcfa5f7fab -s ours
Change-Id: I07dc60c17099ece2d6f947fccd2d7341aa47a24d
Andreas Gampe [Tue, 21 Nov 2017 21:04:36 +0000 (21:04 +0000)]
Merge "PackageManager: Extend cmd interface feedback" am:
d66bc0aaae
am:
362a3b9e2a
Change-Id: I7b3ba7adde559c66ed9b8c02d5dd8134a9aa2b38
Andreas Gampe [Tue, 21 Nov 2017 20:55:13 +0000 (20:55 +0000)]
Merge "PackageManager: Extend cmd interface feedback"
am:
d66bc0aaae
Change-Id: Ic89e1e9e4b5e250bc867d288cf4870690926248c
Treehugger Robot [Tue, 21 Nov 2017 20:38:18 +0000 (20:38 +0000)]
Merge "PackageManager: Extend cmd interface feedback"
TreeHugger Robot [Tue, 21 Nov 2017 20:36:28 +0000 (20:36 +0000)]
Merge "Special handling of processes with recent tasks."
Fyodor Kupolov [Tue, 21 Nov 2017 20:32:26 +0000 (20:32 +0000)]
Merge "Updated JavaDoc for onStartLoading"
TreeHugger Robot [Tue, 21 Nov 2017 20:31:47 +0000 (20:31 +0000)]
Merge "The pm command is no more."
Fyodor Kupolov [Tue, 21 Nov 2017 20:26:00 +0000 (20:26 +0000)]
Merge "Use newline to separate stack trace lines"
Robert Carr [Tue, 21 Nov 2017 20:12:49 +0000 (12:12 -0800)]
Fix NPE with stackless windows.
Namely IME PopupWindows.
Bug:
69596187
Test: Manual
Change-Id: I9fdf4c4a3aa844b223ff8bdcc389acadf44102f0
Makoto Onuki [Mon, 20 Nov 2017 23:20:16 +0000 (15:20 -0800)]
Extreme battery saver: Disable launch boost
Bug:
68769804
Test: manual test with debug log in nativeSendPowerHint().
Change-Id: I7ce61463215400379e0aa0d1782b2372495fe97e
TreeHugger Robot [Tue, 21 Nov 2017 20:08:11 +0000 (20:08 +0000)]
Merge "Global a11y action to lock screen"
TreeHugger Robot [Tue, 21 Nov 2017 20:04:36 +0000 (20:04 +0000)]
Merge "Revert "Implement minikin::Run""
TreeHugger Robot [Tue, 21 Nov 2017 19:56:41 +0000 (19:56 +0000)]
Merge "Close available secondary connections if schema changes"
Makoto Onuki [Tue, 21 Nov 2017 19:53:43 +0000 (19:53 +0000)]
Merge "Extreme battery saver: Cap max cpu frequency."
TreeHugger Robot [Tue, 21 Nov 2017 19:22:57 +0000 (19:22 +0000)]
Merge "PackageManager: Extend cmd interface feedback"
TreeHugger Robot [Tue, 21 Nov 2017 19:16:21 +0000 (19:16 +0000)]
Merge "Sync proto from google3"
Michael Wright [Tue, 21 Nov 2017 18:46:15 +0000 (18:46 +0000)]
Add more OWNERS for classes in android.server
Test: N/A
Change-Id: Ia66382c5da0ed5e4a57b3bf7b0926c389634e144
Fyodor Kupolov [Tue, 21 Nov 2017 18:42:23 +0000 (10:42 -0800)]
Use newline to separate stack trace lines
It was unintentionally removed in patchset 3 of ag/
3221176
Test: manual
Change-Id: Iede0bfe1b5d622fda794ddf4a0bcdbdaeeb4939d
Bryce Lee [Tue, 21 Nov 2017 18:41:50 +0000 (18:41 +0000)]
Merge "Get PackageManager on demand in ActivityStarter."
Michael Wright [Tue, 21 Nov 2017 18:35:16 +0000 (18:35 +0000)]
Add OWNERS to system_server services.
Test: N/A
Change-Id: I60174fcbbf2a061df2961239ec1b45df2e6b20ed
Dianne Hackborn [Tue, 31 Oct 2017 19:55:42 +0000 (19:55 +0000)]
The pm command is no more.
It is now just a shell of itself. :)
Also brings in a few fixes to never try to open files from the system
process.
Test: manual
Change-Id: Ia8187196af597046fd2e7092dbf19ce1dc1ea457
Kenny Guy [Tue, 21 Nov 2017 17:57:39 +0000 (17:57 +0000)]
Merge "Daily idle job for writing out brightness events."
Andreas Gampe [Tue, 21 Nov 2017 01:03:17 +0000 (17:03 -0800)]
PackageManager: Extend cmd interface feedback
When running cmd package compile -a, print the progress, as this
may be a long-running operation.
Test: m
Test: manual
Merged-In: Ic5c8123f972656b722da882d6a19d555b8c60832
Change-Id: Ic5c8123f972656b722da882d6a19d555b8c60832
Andreas Gampe [Tue, 21 Nov 2017 01:03:17 +0000 (17:03 -0800)]
PackageManager: Extend cmd interface feedback
When running cmd package compile -a, print the progress, as this
may be a long-running operation.
Test: m
Test: manual
Change-Id: Ic5c8123f972656b722da882d6a19d555b8c60832
Peter Visontay [Tue, 21 Nov 2017 17:10:18 +0000 (17:10 +0000)]
Merge "Revert "Log the CHANGE_WIFI_STATE App Op in WifiManager (client changes).""
Seigo Nonaka [Tue, 21 Nov 2017 16:58:24 +0000 (16:58 +0000)]
Revert "Implement minikin::Run"
Looks like this causes native crash.
Bug:
69592296
Test: N/A
This reverts commit
c777364d2564acddfe511cbfbc2879d5a1ea8b2d.
Change-Id: I3b3981de3d0fcccf2847f6ed0936338bb1ffb064
Scott Main [Tue, 21 Nov 2017 16:41:00 +0000 (16:41 +0000)]
Merge "add list of supported views to RemoteViews docs Found by searching for all framework views with the @RemoteViews annotation"
Jason Monk [Tue, 21 Nov 2017 16:05:39 +0000 (16:05 +0000)]
Merge "Convert Slice type to string and add optional sub-type"
Kenny Guy [Tue, 14 Nov 2017 21:04:58 +0000 (21:04 +0000)]
Daily idle job for writing out brightness events.
Schedule a job for idle + charging to kick off
writing out brighness slider events.
While writing events discard ones outside our
time window.
Bug:
69405990
Test: Manual using adb to kick off job.
Test: runtest -c com.android.server.display.BrightnessTrackerTest frameworks-services
Change-Id: Ibc79d1c80ced26827d6f985bc70ae165df106a42
Rubin Xu [Tue, 21 Nov 2017 14:30:28 +0000 (14:30 +0000)]
Merge "Remove unnecessary RemoteException declaration"
Jason Monk [Tue, 21 Nov 2017 13:50:09 +0000 (13:50 +0000)]
Merge "Add SliceSpec to Slice API"
Rubin Xu [Tue, 21 Nov 2017 12:05:06 +0000 (12:05 +0000)]
Remove unnecessary RemoteException declaration
Bug:
62264551
Test: compiles
Change-Id: I0b5149b233b4f68b06088cb8edac488b6d1d17dd
Peter Visontay [Tue, 21 Nov 2017 11:46:59 +0000 (11:46 +0000)]
Revert "Log the CHANGE_WIFI_STATE App Op in WifiManager (client changes)."
This reverts commit
dfe291b72bea057a33f92ca156bb6ed699d18b86.
Change-Id: I82e25fb7e46a679d82d89fd5f56e4f334b593f69
Bug:
69498268
Gustav Sennton [Tue, 21 Nov 2017 12:00:00 +0000 (12:00 +0000)]
Merge "Fix WebViewUpdateService test expectation to match reality."
Sungsoo Lim [Tue, 21 Nov 2017 11:58:06 +0000 (11:58 +0000)]
Merge "Call listeners whenever players are removed"
Hugo Benichi [Tue, 21 Nov 2017 05:58:09 +0000 (05:58 +0000)]
Merge "Define PacketWakeup pushed events for statds"
TreeHugger Robot [Tue, 21 Nov 2017 03:34:43 +0000 (03:34 +0000)]
Merge "Improve how parcels are recycled on AssisStructure custom parcelization."
TreeHugger Robot [Tue, 21 Nov 2017 03:34:02 +0000 (03:34 +0000)]
Merge "String update: Internet -> internet"
TreeHugger Robot [Tue, 21 Nov 2017 02:34:21 +0000 (02:34 +0000)]
Merge "Import translations. DO NOT MERGE"
Scott Main [Tue, 21 Nov 2017 02:16:01 +0000 (18:16 -0800)]
add list of supported views to RemoteViews docs
Found by searching for all framework views with the @RemoteViews
annotation
Change-Id: I60e24676014a8ee2f5df0bac87349dad7d92081d
TreeHugger Robot [Tue, 21 Nov 2017 02:20:57 +0000 (02:20 +0000)]
Merge "Import translations. DO NOT MERGE"
Sungsoo Lim [Wed, 1 Nov 2017 04:45:59 +0000 (13:45 +0900)]
Call listeners whenever players are removed
AudioPlayerStateMonitor.onAudioPlayerStateChanged isn't called all the
time when players are removed. This change makes the listener be
called whenever players are removed.
Bug:
68733075
Test: manual tests for restoring media routes and handling media keys
Test: same result from Media CTS with and w/o this change
Change-Id: I7219d757a7001b83e03c8d04fc1cabb12638dafa
TreeHugger Robot [Tue, 21 Nov 2017 01:40:34 +0000 (01:40 +0000)]
Merge "Use serif fonts for serif fallback."
TreeHugger Robot [Tue, 21 Nov 2017 01:33:24 +0000 (01:33 +0000)]
Merge "1/ Duration anomaly tracker with alarm. 2/ Init anomaly from config based on the public language. 3/ Unit tests for anomaly detection in count/gauge producer. 4/ Revisit the duration tracker logic."
TreeHugger Robot [Tue, 21 Nov 2017 01:27:15 +0000 (01:27 +0000)]
Merge "WebView: misc docs changes for WebSettings"
Malcolm Chen [Tue, 21 Nov 2017 01:09:47 +0000 (01:09 +0000)]
Merge "Adding "Mobile data" and "Data usage" button in mobile settings." am:
06e314f6cc -s ours am:
959385c314 -s ours
am:
f4a336808b -s ours
Change-Id: Ie0761a8a549382d9d8a6781c20a6a23f511231fc
Hugo Benichi [Tue, 14 Nov 2017 13:42:46 +0000 (22:42 +0900)]
Define PacketWakeup pushed events for statds
This patch pushes packet wakeup events collected by
NetdEventListenerService into the statds service.
Example logs from $ adb logcat -b stats
11-20 23:33:25.955 955 972 I [44] : [10014,wlan0,34525,10:e:7e:26:3f:c1,2001:db8:400d:c0b::bc,2001:db8:4:fd00:a00a:dbc8:f5ba:4269,6,5228,49411]
11-20 23:37:05.809 955 1473 I [44] : [10014,wlan0,2048,10:e:7e:26:3f:c1,192.168.0.142,192.168.0.39,6,443,45422]
11-20 23:42:09.233 955 1473 I [44] : [10014,wlan0,2048,10:e:7e:26:3f:c1,192.168.12.238,192.168.0.39,6,443,40160]
11-20 23:55:28.162 955 1207 I [44] : [10059,wlan0,34525,10:e:7e:26:3f:c1,2001:db8:4004:807::200a,2001:db8:4:fd00:a00a:dbc8:f5ba:4269,6,443,42492]
11-20 23:59:18.343 955 1888 I [44] : [10059,wlan0,34525,10:e:7e:26:3f:c1,2001:db8:4004:807::200a,2001:db8:4:fd00:a00a:dbc8:f5ba:4269,6,443,42491]
11-21 00:00:17.952 955 3341 I [44] : [10014,wlan0,34525,10:e:7e:26:3f:c1,2001:db8:400d:c0b::bc,2001:db8:4:fd00:a00a:dbc8:f5ba:4269,6,5228,49411]
11-21 00:13:05.552 955 1473 I [44] : [-1,wlan0,34525,10:e:7e:26:3f:c1,2001:db8:4004:805::200a,2001:db8:4:fd00:a00a:dbc8:f5ba:4269,6,443,38098]
11-21 00:13:50.606 955 1207 I [44] : [-1,wlan0,2048,10:e:7e:26:3f:c1,192.168.5.238,192.168.0.39,6,443,40802]
Bug:
28806131
Test: runtest frameworks-net
Change-Id: I5a3c76498a4b720f0d9308a65b5dd4b32377d0d1
Makoto Onuki [Mon, 20 Nov 2017 22:31:06 +0000 (14:31 -0800)]
Extreme battery saver: Cap max cpu frequency.
- Lower the max CPU frequency on battery saver.
- We have different sets of frequencies for screen-on and screen-off.
- The frequency configuration is from R.string.config_batterySaverDeviceSpecificConfig.
Bug:
68769804
Test: Manual test with settings put global battery_saver_device_specific_constants cpufreq-n=0:
1324800/4:
1497600,cpufreq-i=0:
1900800/4:
1958400
using cat_repeat /sys/devices/system/cpu/cpu{0,4}/cpufreq/{cpuinfo_cur,scaling_max}_freq
Test: atest $ANDROID_BUILD_TOP/frameworks/base/services/tests/servicestests/src/com/android/server/power/batterysaver/CpuFrequenciesTest.java
Test: atest $ANDROID_BUILD_TOP/frameworks/base/services/tests/servicestests/src/com/android/server/power/batterysaver/FileUpdaterTest.java
Change-Id: Ie1bb11c46c0d4730129fe9d82e86d8acebe0b560
Malcolm Chen [Tue, 21 Nov 2017 00:58:19 +0000 (00:58 +0000)]
Merge "Adding "Mobile data" and "Data usage" button in mobile settings." am:
06e314f6cc -s ours
am:
959385c314 -s ours
Change-Id: Ie6d211fd5ebfeb5a191e1d96a7d3bb37ee9b7d23
Malcolm Chen [Tue, 21 Nov 2017 00:48:30 +0000 (00:48 +0000)]
Merge "Adding "Mobile data" and "Data usage" button in mobile settings."
am:
06e314f6cc -s ours
Change-Id: I3e7e4818688b8e046499513557825809772a1085
Treehugger Robot [Tue, 21 Nov 2017 00:35:42 +0000 (00:35 +0000)]
Merge "Adding "Mobile data" and "Data usage" button in mobile settings."
Bill Yi [Tue, 21 Nov 2017 00:35:34 +0000 (16:35 -0800)]
Import translations. DO NOT MERGE
Change-Id: I111e2a8d4ec350a1167dfa07dfd0b764436194bd
Auto-generated-cl: translation import
Bill Yi [Tue, 21 Nov 2017 00:33:29 +0000 (16:33 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id49a06e39b19dae6b1ce6e131d12d80bff0270b1
Auto-generated-cl: translation import
TreeHugger Robot [Tue, 21 Nov 2017 00:17:56 +0000 (00:17 +0000)]
Merge "Smooth scroll RecyclerView on a11y ACTION_SCROLL_*"
TreeHugger Robot [Tue, 21 Nov 2017 00:00:48 +0000 (00:00 +0000)]
Merge "Implement minikin::Run"
TreeHugger Robot [Mon, 20 Nov 2017 23:49:53 +0000 (23:49 +0000)]
Merge "Import translations. DO NOT MERGE"
Yangster-mac [Fri, 10 Nov 2017 04:38:30 +0000 (20:38 -0800)]
1/ Duration anomaly tracker with alarm.
2/ Init anomaly from config based on the public language.
3/ Unit tests for anomaly detection in count/gauge producer.
4/ Revisit the duration tracker logic.
Test: unit test passed.
Change-Id: I2423c0e0f05b1e37626954de9e749303423963f2
Fan Zhang [Mon, 20 Nov 2017 23:12:27 +0000 (15:12 -0800)]
String update: Internet -> internet
Change-Id: I1d66c6acc32c35f378f3806b1bd3a32ad59f485c
Fixes:
69388824
Fixes:
69387604
Test: visual
Tomasz Mikolajewski [Mon, 20 Nov 2017 23:13:58 +0000 (23:13 +0000)]
Merge "Fix freeform window resizing."
TreeHugger Robot [Mon, 20 Nov 2017 23:07:23 +0000 (23:07 +0000)]
Merge "Optimize Autofill Sanitizer to work as a Validator."
Seigo Nonaka [Wed, 5 Jul 2017 23:06:23 +0000 (16:06 -0700)]
Use serif fonts for serif fallback.
Bug:
31491668
Test: m -j1024 fontchain_lint
Change-Id: Ic1d356aa684f2284b0b0fc8de5d0e36380eb44bc
TreeHugger Robot [Mon, 20 Nov 2017 22:44:08 +0000 (22:44 +0000)]
Merge "Collect set of "changed" classes."
Dianne Hackborn [Thu, 16 Nov 2017 01:54:18 +0000 (17:54 -0800)]
Special handling of processes with recent tasks.
As the startup time of application processes has increased,
it is becoming more useful to try to keep around the process
for a recently used app, even if there are no longer any
actively running activities in it. (For example, if you backed
out of the root activity.)
This change implements that behavior, keeping track of any recent
task entries that a process represents the root activity for,
and classififying them under a new cached proc state that is
managed the same as a cached activity.
Test: manual
Bug:
69386069
Change-Id: I430741646478763fd85b33a5384278ece831b2c3
Bill Yi [Mon, 20 Nov 2017 22:34:18 +0000 (22:34 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
c7d9045105 -s ours
am:
651cb9ec20 -s ours
Change-Id: Ie35ab0514caa65270a0e53fbde8f5de3c0a920de
Bill Yi [Mon, 20 Nov 2017 22:27:19 +0000 (22:27 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
c7d9045105 -s ours
Change-Id: I4e65a2c460b3bcfa2e258a2952677b16d89e4d85
TreeHugger Robot [Mon, 20 Nov 2017 22:13:17 +0000 (22:13 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Rob Carr [Mon, 20 Nov 2017 22:02:18 +0000 (22:02 +0000)]
Merge changes from topic "new-z-order"
* changes:
Reimplement DimLayer's using hierarchy.
Re-implement Z-ordering based off SurfaceControl hierarchy.
TreeHugger Robot [Mon, 20 Nov 2017 22:00:40 +0000 (22:00 +0000)]
Merge "Import translations. DO NOT MERGE"
Seigo Nonaka [Wed, 15 Nov 2017 20:06:24 +0000 (12:06 -0800)]
Implement minikin::Run
The minikin::Run is a callback for measuring text piece.
Implement minikin::Run instead of own Run.
Bug:
65024629
Test: N/A
Change-Id: Iec899dc9f91e1af38338dbfd2a8dc5f4cddd3649
TreeHugger Robot [Mon, 20 Nov 2017 21:59:46 +0000 (21:59 +0000)]
Merge "Import translations. DO NOT MERGE"
Chih-hung Hsieh [Mon, 20 Nov 2017 21:51:42 +0000 (21:51 +0000)]
Merge "Use -Werror in frameworks/base" am:
a29836ad04 am:
267a2a8c8a
am:
af60d7f8b5
Change-Id: I9daf24758eab254650dc0ea8809c56d0d536a641
Chih-hung Hsieh [Mon, 20 Nov 2017 21:40:59 +0000 (21:40 +0000)]
Merge "Use -Werror in frameworks/base" am:
a29836ad04
am:
267a2a8c8a
Change-Id: Ibfc63a029813ef952dc94f11baae7a96850e94d6
Philip P. Moltmann [Mon, 20 Nov 2017 21:40:55 +0000 (21:40 +0000)]
Merge "Make SharedPreferences check with higher precision" am:
9ca31879b0 -s ours am:
79d7319d7e -s ours
am:
3e0c2b73cd -s ours
Change-Id: I4e956376312317c868db00a3c15f7ec4a33bc8b6