OSDN Git Service
TreeHugger Robot [Wed, 19 Jul 2017 22:39:17 +0000 (22:39 +0000)]
Merge "Restore device locale from backup."
Ahmed ElArabawy [Wed, 19 Jul 2017 22:17:21 +0000 (22:17 +0000)]
Merge "Add Configuration to APF Policy" into oc-dr1-dev am:
1da6af31ff
am:
1885632105
Change-Id: I5949798a6531344ed90301f452165838fa8adb6a
TreeHugger Robot [Wed, 19 Jul 2017 22:15:24 +0000 (22:15 +0000)]
Merge "Fix Fragment.onCreate() not being called in some cases."
Ahmed ElArabawy [Wed, 19 Jul 2017 22:11:40 +0000 (22:11 +0000)]
Merge "Add Configuration to APF Policy" into oc-dr1-dev
am:
1da6af31ff
Change-Id: I16346bb98a0b9259f7c3f51e318c472cfc1bb492
TreeHugger Robot [Wed, 19 Jul 2017 22:02:09 +0000 (22:02 +0000)]
Merge "Add Configuration to APF Policy" into oc-dr1-dev
TreeHugger Robot [Wed, 19 Jul 2017 21:56:47 +0000 (21:56 +0000)]
Merge "Fix use-after-free"
TreeHugger Robot [Wed, 19 Jul 2017 20:39:10 +0000 (20:39 +0000)]
Merge "Standardize usages of "/" separator in SettingsLib"
TreeHugger Robot [Wed, 19 Jul 2017 20:26:59 +0000 (20:26 +0000)]
Merge "Always populate the ApplicationInfo object"
TreeHugger Robot [Wed, 19 Jul 2017 19:49:49 +0000 (19:49 +0000)]
Merge "Add FailureReason to WifiConfiguration"
TreeHugger Robot [Wed, 19 Jul 2017 19:02:19 +0000 (19:02 +0000)]
Merge "Unhide several Fingerprint APIs"
Lucas Dupin [Wed, 19 Jul 2017 18:56:20 +0000 (18:56 +0000)]
Merge "Default gradient should be the dark version" into oc-dr1-dev am:
4dfb200d1b
am:
85fa07b831
Change-Id: I66389304ab13274dabafe2993d8cd2a5a172d1c0
Lucas Dupin [Wed, 19 Jul 2017 18:48:15 +0000 (18:48 +0000)]
Merge "Default gradient should be the dark version" into oc-dr1-dev
am:
4dfb200d1b
Change-Id: I72a0674c9a180f65536553e30f80317276073365
Sudheer Shanka [Wed, 19 Jul 2017 18:47:27 +0000 (18:47 +0000)]
Merge "Update logic for attribution of per-cpu cluster times to each uid."
Fyodor Kupolov [Wed, 19 Jul 2017 18:42:32 +0000 (18:42 +0000)]
Merge "Close idle sqlite connections"
Tao Bao [Wed, 19 Jul 2017 18:40:48 +0000 (18:40 +0000)]
Merge "UpdateEngine: Expose unbind as system API."
TreeHugger Robot [Wed, 19 Jul 2017 18:40:38 +0000 (18:40 +0000)]
Merge "Default gradient should be the dark version" into oc-dr1-dev
Badhri Jagan Sridharan [Wed, 19 Jul 2017 18:16:40 +0000 (18:16 +0000)]
Merge "Always reevaluate whether to show the notification for USB_DEVICE_* intents" into oc-dr1-dev am:
d5f442d65b
am:
19ad4c2055
Change-Id: I4b6edbefd70585302959aa830f5a6d50f4f01a4d
Badhri Jagan Sridharan [Wed, 19 Jul 2017 18:11:25 +0000 (18:11 +0000)]
Merge "Always reevaluate whether to show the notification for USB_DEVICE_* intents" into oc-dr1-dev
am:
d5f442d65b
Change-Id: I00374ea814200a8142e208f9fa2f7b7e2a45f4b0
Jean-Michel Trivi [Wed, 19 Jul 2017 18:09:06 +0000 (18:09 +0000)]
Merge "AudioService dump: sort player piids"
TreeHugger Robot [Wed, 19 Jul 2017 18:01:26 +0000 (18:01 +0000)]
Merge "Always reevaluate whether to show the notification for USB_DEVICE_* intents" into oc-dr1-dev
George Burgess IV [Wed, 19 Jul 2017 17:57:22 +0000 (17:57 +0000)]
Merge "Fix static analyzer complaints" am:
a3bde81205 am:
3e0a8b1d2b am:
c6c395b6b1
am:
dd415c0734
Change-Id: Iab6e42f39e7f058b823551932f55b05429c0da48
George Mount [Wed, 19 Jul 2017 17:47:48 +0000 (10:47 -0700)]
Fix Fragment.onCreate() not being called in some cases.
Bug
62798751
When an application process has been killed with a retained instance
fragment on its back stack, and a configuration change causes
state save, the retained instance fragment was not calling onCreate()
when it was popped back into existence.
The cause of the problem is that the mRetaining flag was being set,
and when it was supposed to go through onCreate(), it was skipped.
This CL uses a new flag to judge whether or not a Fragment has
called onCreate() or not.
Test: I512f8c174f557ee7ed18a9b9dc5c0c3e7a5843a5
Support Lib Change: Ia66a1f474d815f657b6962097139c796f7fa198b
Change-Id: Ia7878f4ac67ee8cfa05903ba6749ab9851f603ee
George Burgess IV [Wed, 19 Jul 2017 17:49:54 +0000 (17:49 +0000)]
Merge "Fix static analyzer complaints" am:
a3bde81205 am:
3e0a8b1d2b
am:
c6c395b6b1
Change-Id: I6b2e0d2f2aa60b347699e7149a0c2af3ea0f6c93
George Burgess IV [Wed, 19 Jul 2017 17:41:55 +0000 (17:41 +0000)]
Merge "Fix static analyzer complaints" am:
a3bde81205
am:
3e0a8b1d2b
Change-Id: Ia66a6a5ab4fd59772a5df71ede75227d353e5d25
Sudheer Shanka [Wed, 19 Jul 2017 17:37:07 +0000 (17:37 +0000)]
Merge "Log if there is malformed data in the proc file."
George Burgess IV [Wed, 19 Jul 2017 17:36:23 +0000 (17:36 +0000)]
Merge "Fix static analyzer complaints"
am:
a3bde81205
Change-Id: I39f7b56c6abc0398cd517eef174b0620dbc50caa
Philip P. Moltmann [Wed, 19 Jul 2017 17:33:44 +0000 (17:33 +0000)]
Merge "Make SharedPreferences check with higher precision"
Treehugger Robot [Wed, 19 Jul 2017 17:26:36 +0000 (17:26 +0000)]
Merge "Fix static analyzer complaints"
Todd Kennedy [Wed, 19 Jul 2017 16:47:55 +0000 (09:47 -0700)]
Always populate the ApplicationInfo object
While scanning system apps, we abort package/application info setup
if an app on /system is not a higher version than an upgrade on /data.
Instead, we need to still fully populate these objects because they
can be retrievd using the MATCH_FACTORY_ONLY flag.
Change-Id: I0262b46f446eace60ce94f1428f3fb15d785a89c
Fixes:
62980149
Test: Manual
Test: Create a sample application that dumps the contents of an ApplicationInfo object for a given package
Test: Install the sample application on the /system partition and "upgrade" the sample application so it's also on the /data partition
Test: Create a secondary user and disable the sample application
Test: Reboot the device
Test: Run the sample application as the primary user and see that the ApplicationInfo object is correctly populated
TreeHugger Robot [Wed, 19 Jul 2017 16:43:42 +0000 (16:43 +0000)]
Merge "Remove unused includes"
Beverly [Wed, 19 Jul 2017 15:31:37 +0000 (15:31 +0000)]
Merge ""Block notifications screen off" setting is used" into oc-dr1-dev am:
dc7b2bc5e3
am:
b099455971
Change-Id: I91ec657bd39e9be2466ed31c7174ec4ec3a43e93
Beverly [Wed, 19 Jul 2017 15:26:12 +0000 (15:26 +0000)]
Merge ""Block notifications screen off" setting is used" into oc-dr1-dev
am:
dc7b2bc5e3
Change-Id: I4d2f9058da7dfec5197edb6f7e25ed2d889ff756
TreeHugger Robot [Wed, 19 Jul 2017 15:21:32 +0000 (15:21 +0000)]
Merge ""Block notifications screen off" setting is used" into oc-dr1-dev
Philip P. Moltmann [Mon, 17 Jul 2017 19:41:53 +0000 (12:41 -0700)]
Make SharedPreferences check with higher precision
When two processes modify shared preferences we use the timestamp to
figure out if the file was changes underneath. Do this with the highest
precision available (instead of sec) as before.
It would be possible to make the check more reliable by writing a unique
id to the shared pref file, but this would make this check much more
expensive in the common case that nothing changed. Considering that this
has not been a problem and we don't officially give any guarantee for
this sounds like a good middle-ground.
Change-Id: I04c96b6a946618d5599c26410c88d7cd654d31fb
Test: SharedPreferencesTest
Fixes:
62949739
Mike Reed [Wed, 19 Jul 2017 15:01:05 +0000 (11:01 -0400)]
Remove unused includes
Test: make
Change-Id: I2baead9f81db488e1ae4a83354cb396841085b71
Carlos Vinueza [Wed, 19 Jul 2017 14:43:36 +0000 (14:43 +0000)]
Merge "Adding 26 free short codes for DCB and other purposes" am:
1585b2e7b7 am:
3a6a8b9baa am:
263e83370e
am:
33d0a78c28
Change-Id: Idee829d7a874cc2dd7c850c5a9b8807a1d72ecd1
Carlos Vinueza [Wed, 19 Jul 2017 14:37:59 +0000 (14:37 +0000)]
Merge "Adding 26 free short codes for DCB and other purposes" am:
1585b2e7b7 am:
3a6a8b9baa
am:
263e83370e
Change-Id: Iaa2f0574fd83fb1cbe6bfbe65424e12e10b1076f
Carlos Vinueza [Wed, 19 Jul 2017 14:33:04 +0000 (14:33 +0000)]
Merge "Adding 26 free short codes for DCB and other purposes" am:
1585b2e7b7
am:
3a6a8b9baa
Change-Id: I61ae7d0404463c160dd22675c84b0782f33a3c5d
Jorim Jaggi [Wed, 19 Jul 2017 14:33:00 +0000 (14:33 +0000)]
Merge "Fixes for increased usage of light navigation bar" into oc-dr1-dev am:
3dc5e0ae3a
am:
49824690de
Change-Id: Ib31c87334d9fc2b9943250b26fcbbcac3921e0cb
Jorim Jaggi [Wed, 19 Jul 2017 14:27:38 +0000 (14:27 +0000)]
Merge "Fixes for increased usage of light navigation bar" into oc-dr1-dev
am:
3dc5e0ae3a
Change-Id: Ied6d9ca3f60b66aceebb326c536aea0267d166ad
Carlos Vinueza [Wed, 19 Jul 2017 14:26:55 +0000 (14:26 +0000)]
Merge "Adding 26 free short codes for DCB and other purposes"
am:
1585b2e7b7
Change-Id: Ia85bdccb4c6b15c6b5b7974f4cb5cc34af04d8d1
TreeHugger Robot [Wed, 19 Jul 2017 14:19:54 +0000 (14:19 +0000)]
Merge "Fixes for increased usage of light navigation bar" into oc-dr1-dev
Treehugger Robot [Wed, 19 Jul 2017 14:13:36 +0000 (14:13 +0000)]
Merge "Adding 26 free short codes for DCB and other purposes"
Christine Franks [Wed, 19 Jul 2017 14:11:38 +0000 (14:11 +0000)]
Merge "Add new configuration values for demo mode" into oc-dr1-dev am:
f2dc5c69a4
am:
3f52f6344a
Change-Id: I6bda3fb8b8eee7f19d40eb57a00f2df0106f3a17
Christine Franks [Wed, 19 Jul 2017 14:06:05 +0000 (14:06 +0000)]
Merge "Add new configuration values for demo mode" into oc-dr1-dev
am:
f2dc5c69a4
Change-Id: I84a07c360044384b397767c29ac3751060c60900
Christine Franks [Wed, 19 Jul 2017 13:59:22 +0000 (13:59 +0000)]
Merge "Add new configuration values for demo mode" into oc-dr1-dev
Tomasz Wasilczyk [Wed, 19 Jul 2017 13:55:55 +0000 (13:55 +0000)]
Merge "Add DRMO_MODULATION program identifier type."
Tomasz Wasilczyk [Mon, 17 Jul 2017 22:40:33 +0000 (15:40 -0700)]
Add DRMO_MODULATION program identifier type.
Bug: b/
63702941
Test: it builds
Change-Id: I430af5a98fa29f7666be815947c8456fc37e54ab
TreeHugger Robot [Wed, 19 Jul 2017 13:37:19 +0000 (13:37 +0000)]
Merge "Fix Skia pipeline readback for non-portrait mode"
Android Build Merger (Role) [Wed, 19 Jul 2017 13:26:33 +0000 (13:26 +0000)]
Merge "Merge "Add log when we are trying to dismiss keyguard" into oc-dr1-dev am:
f89512c731 am:
3e45cde6b5 -s ours"
Jorim Jaggi [Wed, 19 Jul 2017 13:25:37 +0000 (13:25 +0000)]
Merge "Add log when we are trying to dismiss keyguard" into oc-dr1-dev am:
f89512c731
am:
3e45cde6b5 -s ours
Change-Id: I858de863ed68a401f7f7451f136e45bce4d4cbbe
TreeHugger Robot [Wed, 19 Jul 2017 13:25:27 +0000 (13:25 +0000)]
Merge "Improve color correctness for drawing bitmaps with Skia pipeline"
Stan Iliev [Mon, 10 Jul 2017 21:04:03 +0000 (17:04 -0400)]
Improve color correctness for drawing bitmaps with Skia pipeline
Fix drawing of bitmaps with color profiles. This CL is making
ColorSpaceTests and Rgba16fTests CTS tests to pass with Skia
pipeline. Drawing bitmaps withs pixels outside SRGB range
may need more work (ColorSpaceTests#testDrawDisplayP3 test use a
a wider gamut, but the actual pixels fall into the SRGB range).
Test: Ran CtsUiRenderingTestCases with HWUI and Skia pipeline.
Bug:
62347704
Change-Id: I8d318076bb38f7d32bfde7e5492ae7a61f4731a5
Jorim Jaggi [Wed, 19 Jul 2017 13:19:55 +0000 (13:19 +0000)]
Merge "Add log when we are trying to dismiss keyguard" into oc-dr1-dev
am:
f89512c731
Change-Id: If62e97a3a85d1cc0748fb40f91b233104f000e85
TreeHugger Robot [Wed, 19 Jul 2017 13:11:26 +0000 (13:11 +0000)]
Merge "Add log when we are trying to dismiss keyguard" into oc-dr1-dev
TreeHugger Robot [Wed, 19 Jul 2017 12:44:52 +0000 (12:44 +0000)]
Merge "Fix incorrect asserts"
Jorim Jaggi [Wed, 19 Jul 2017 11:57:56 +0000 (11:57 +0000)]
Merge "Send app transition starting event at right time" into oc-dr1-dev am:
790e3ff6e3
am:
2eb38600c4
Change-Id: I5fae06627aefb39a6904a9ef1c3608f766b8e661
Jorim Jaggi [Wed, 19 Jul 2017 11:52:02 +0000 (11:52 +0000)]
Merge "Send app transition starting event at right time" into oc-dr1-dev
am:
790e3ff6e3
Change-Id: Iadada99fc926de016dc78b1a82270ceda5039066
TreeHugger Robot [Wed, 19 Jul 2017 11:45:50 +0000 (11:45 +0000)]
Merge "Send app transition starting event at right time" into oc-dr1-dev
Jorim Jaggi [Wed, 19 Jul 2017 11:19:48 +0000 (11:19 +0000)]
Fix wrong nav bar animation when unlocking from AOD am:
f5304ad7be
am:
be7dea4f81
Change-Id: Ic143bc2183281371d861290189a2c6190a9e0150
Jorim Jaggi [Wed, 19 Jul 2017 11:14:18 +0000 (11:14 +0000)]
Fix wrong nav bar animation when unlocking from AOD
am:
f5304ad7be
Change-Id: I19e8db94e2ad70c8d6e267b0a85e6885cf80305b
Jorim Jaggi [Mon, 17 Jul 2017 16:31:13 +0000 (18:31 +0200)]
Fix wrong nav bar animation when unlocking from AOD
Visibility of navigation bar was set too late. Set it earlier
such that it gets the right animation.
In addition to that, fixes a bug where Keyguard unlock animation
was terminated too early if there was already a scrim animation
pending.
Test: Wake-and-unlock from Aod
Bug:
63726451
Change-Id: I9a45fb27db68d56904c0fade40ea1173176beae8
Jorim Jaggi [Mon, 17 Jul 2017 14:46:00 +0000 (16:46 +0200)]
Fixes for increased usage of light navigation bar
- Fix an issue where IME doesn't really cover nav area but still
became window to deterine light navigation.
- Only invert nav bar icons when expanding the shade if the scrim
is dark.
- Fix logic such that status bar always becomes the window to
dermine light nav bar on lockscreen.
Test: Open shade with light nav
Test: Open Keyguard in landscape in all apps
Test: Unlock phone with light nav
Change-Id: If024a8b81942a6675243b703c0509cd88de8d932
Fixes:
63539478
Fixes:
63533427
Fixes:
63577858
Jorim Jaggi [Wed, 19 Jul 2017 10:30:43 +0000 (10:30 +0000)]
Merge "Fix threading issue with splash screens" into oc-dr1-dev am:
ffc3f50b02
am:
6b4ef0049f
Change-Id: I56871d6a077e3fe42873304afa634e6e45cf7e60
Jorim Jaggi [Wed, 19 Jul 2017 10:25:27 +0000 (10:25 +0000)]
Merge "Fix threading issue with splash screens" into oc-dr1-dev
am:
ffc3f50b02
Change-Id: I20e456309ddae5f1a75b309726807295c414a6d3
Jorim Jaggi [Wed, 19 Jul 2017 10:17:37 +0000 (10:17 +0000)]
Merge "Fix threading issue with splash screens" into oc-dr1-dev
Neil Fuller [Wed, 19 Jul 2017 10:07:25 +0000 (10:07 +0000)]
Merge "Re-enable some test cases" am:
8feaad7249 am:
a76d88d26d am:
450c3bc1cd
am:
ea0e2bd457
Change-Id: I6f3eaa28a59dd11037c8d1eec9b9621a23bf220a
Neil Fuller [Wed, 19 Jul 2017 10:01:47 +0000 (10:01 +0000)]
Merge "Re-enable some test cases" am:
8feaad7249 am:
a76d88d26d
am:
450c3bc1cd
Change-Id: I89a31203310c0ea130b9a4f70656a2f81f372c34
Neil Fuller [Wed, 19 Jul 2017 09:56:17 +0000 (09:56 +0000)]
Merge "Re-enable some test cases" am:
8feaad7249
am:
a76d88d26d
Change-Id: I03fcdebbe246fcffb92b7598d3084b3383982d98
Neil Fuller [Wed, 19 Jul 2017 09:51:17 +0000 (09:51 +0000)]
Merge "Re-enable some test cases"
am:
8feaad7249
Change-Id: I1b86866748afa6d6014abcbf59116a7abf67b54e
Neil Fuller [Wed, 19 Jul 2017 09:40:52 +0000 (09:40 +0000)]
Merge "Re-enable some test cases"
Jorim Jaggi [Tue, 18 Jul 2017 11:22:52 +0000 (13:22 +0200)]
Send app transition starting event at right time
Otherwise we are skipping an important section of the code that
might contain delays.
Test: Go to recents, check app transition delay in eventlog
Change-Id: Ie9ccc1dd37f1a0ffeb7c18a410a5148dbfb02ccf
Fixes:
63793419
Hugo Benichi [Wed, 19 Jul 2017 08:20:23 +0000 (08:20 +0000)]
Merge "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone" am:
24a2adfa27 am:
f6883504c2 am:
b1894abbc5
am:
443f3aa138
Change-Id: I7d3bfdf6d95d5db2d31439b5c3334569666864e1
Hugo Benichi [Wed, 19 Jul 2017 08:15:12 +0000 (08:15 +0000)]
Merge "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone" am:
24a2adfa27 am:
f6883504c2
am:
b1894abbc5
Change-Id: I458a0fdae874039e0f1d5cd38ed8ad0a1754bba9
Hugo Benichi [Wed, 19 Jul 2017 08:09:38 +0000 (08:09 +0000)]
Merge "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone" am:
24a2adfa27
am:
f6883504c2
Change-Id: I432f419d1c8f93136a76cbadfd32018294b3e3d7
Hugo Benichi [Wed, 19 Jul 2017 08:04:48 +0000 (08:04 +0000)]
Merge "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone"
am:
24a2adfa27
Change-Id: I4be1d2ce67871c1e01364beca886fdd3af374321
Treehugger Robot [Wed, 19 Jul 2017 07:54:45 +0000 (07:54 +0000)]
Merge "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone"
TreeHugger Robot [Wed, 19 Jul 2017 07:16:33 +0000 (07:16 +0000)]
Merge "Uses Pattern instead of String for new Autofill Save API."
Hugo Benichi [Wed, 19 Jul 2017 01:10:52 +0000 (10:10 +0900)]
ConnectivityServiceTest: fix testNetworkInfoOfTypeNone
This patch fixes a couple of flakyness issues with
testNetworkInfoOfTypeNone. It also fixes some typos and naming issues.
Bug:
62918393,
62918393
Test: runtest frameworks-net
Change-Id: I1c56557ab113d3ef57dbc06a6e882634d03c5b09
TreeHugger Robot [Wed, 19 Jul 2017 05:13:00 +0000 (05:13 +0000)]
Merge "Changed SaveInfo so it supports just optional ids."
Ricardo Loo [Wed, 19 Jul 2017 04:58:33 +0000 (04:58 +0000)]
Merge "Merge "docs: Updated #ACTION_REQUEST_SET_AUTOFILL_SERVICE description" into oc-dev am:
8e644a7510 am:
04b48078e8" into oc-dr1-dev-plus-aosp
am:
8e8d274ed0
Change-Id: Ic4db9dccec8c19bb66180f179b46fdcca022e95b
Ricardo Loo [Wed, 19 Jul 2017 04:56:56 +0000 (04:56 +0000)]
Merge "docs: Updated #ACTION_REQUEST_SET_AUTOFILL_SERVICE description" into oc-dev am:
8e644a7510 am:
73f94e7896
am:
8fef5bf360
Change-Id: Iceee88d3362d7e8392cbf99666daeb1bd9eb0046
Android Build Merger (Role) [Wed, 19 Jul 2017 04:53:38 +0000 (04:53 +0000)]
Merge "Merge "docs: Updated #ACTION_REQUEST_SET_AUTOFILL_SERVICE description" into oc-dev am:
8e644a7510 am:
04b48078e8" into oc-dr1-dev-plus-aosp
Ricardo Loo [Wed, 19 Jul 2017 04:52:28 +0000 (04:52 +0000)]
Merge "docs: Updated #ACTION_REQUEST_SET_AUTOFILL_SERVICE description" into oc-dev am:
8e644a7510
am:
04b48078e8
Change-Id: Id6a3179c4acc9f33174b8b83b406d59bd8129331
Ricardo Loo [Wed, 19 Jul 2017 04:52:24 +0000 (04:52 +0000)]
Merge "docs: Updated #ACTION_REQUEST_SET_AUTOFILL_SERVICE description" into oc-dev am:
8e644a7510
am:
73f94e7896
Change-Id: I5f6181c026d443357226f6b7e5332a754b130476
Ricardo Loo [Wed, 19 Jul 2017 04:44:53 +0000 (04:44 +0000)]
Merge "docs: Updated #ACTION_REQUEST_SET_AUTOFILL_SERVICE description" into oc-dev
am:
8e644a7510
Change-Id: I3d1a700fe2f5061601c8c874317da4f42ad83772
Ricardo Loo [Wed, 19 Jul 2017 04:44:52 +0000 (04:44 +0000)]
Merge "docs: Updated #ACTION_REQUEST_SET_AUTOFILL_SERVICE description" into oc-dev
am:
8e644a7510
Change-Id: Ib12f6abb1cd3bdc4701b13e607288fcaf48ce43e
Ricardo Loo [Wed, 19 Jul 2017 04:36:42 +0000 (04:36 +0000)]
Merge "docs: Updated #ACTION_REQUEST_SET_AUTOFILL_SERVICE description" into oc-dev
TreeHugger Robot [Wed, 19 Jul 2017 03:33:31 +0000 (03:33 +0000)]
Merge "Zygote: Poll with timeout for pid"
Chen Xu [Wed, 19 Jul 2017 03:17:53 +0000 (03:17 +0000)]
Merge "initial value for data_roaming based on carrier" into oc-dr1-dev am:
068397a319
am:
47208e2cf5
Change-Id: I3d2af92b69f3a5736323900c27dcecc096eb1ab7
Chen Xu [Wed, 19 Jul 2017 03:12:33 +0000 (03:12 +0000)]
Merge "initial value for data_roaming based on carrier" into oc-dr1-dev
am:
068397a319
Change-Id: I5c65666208e834a5b0ad5280f1670a0d7b31aa31
Chen Xu [Wed, 19 Jul 2017 03:06:01 +0000 (03:06 +0000)]
Merge "initial value for data_roaming based on carrier" into oc-dr1-dev
Steven Moreland [Wed, 19 Jul 2017 02:46:48 +0000 (02:46 +0000)]
Reference nativehelper/jni.h as jni.h am:
d82cdb4624 am:
6b9d4b76ae
am:
8e9b7efefd
Change-Id: I50143a02c35a9924e77afcbe5b70564058c3ed3e
Steven Moreland [Wed, 19 Jul 2017 02:41:21 +0000 (02:41 +0000)]
Reference nativehelper/jni.h as jni.h am:
d82cdb4624
am:
6b9d4b76ae
Change-Id: I27f7f300b0a4e3d8d8d150e7902ed2763b442a4b
Steven Moreland [Wed, 19 Jul 2017 02:36:09 +0000 (02:36 +0000)]
Reference nativehelper/jni.h as jni.h
am:
d82cdb4624
Change-Id: I0c83f089c388f2e967323a0e74a8582904cb4cbd
TreeHugger Robot [Wed, 19 Jul 2017 02:36:04 +0000 (02:36 +0000)]
Merge "Appease the static analyzer"
Steven Moreland [Tue, 18 Jul 2017 02:00:43 +0000 (19:00 -0700)]
Reference nativehelper/jni.h as jni.h
nativehelper will no longer export nativehelper/jni.h so that everywhere
can reference this file with the same name.
Bug:
63762847
Change-Id: I3e58d478a2eb17b19db540414545a3c1f9c381af
(cherry picked from commit
98f40c71399e63f2b10cf6e3dffbbcea84d52490)
TreeHugger Robot [Wed, 19 Jul 2017 02:25:23 +0000 (02:25 +0000)]
Merge "IP metrics: update link layer mapping"
TreeHugger Robot [Wed, 19 Jul 2017 02:18:58 +0000 (02:18 +0000)]
Merge "Remove references to (unused) colortables"
Phil Weaver [Wed, 19 Jul 2017 01:43:42 +0000 (01:43 +0000)]
Merge "Merge "Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev am:
4a1dc3458d am:
a84f7a3028 am:
72c56fb84a -s ours am:
ea6aaed42d" into oc-dev-plus-aosp am:
6ba27f079f" into oc-dr1-dev-plus-aosp
am:
db39f87386
Change-Id: Iee216425127540370783e43d40d85066f7212ef0
OSDN Git Service
