Commit Graph

41 Commits

Author SHA1 Message Date
7154675432 ANdroid->LTE: surpport EC20 4Gdongle 2017-10-26 09:04:34 +08:00
0cf8dc1952 Android->Add SLM630B RIL 2017-03-21 10:42:30 +08:00
cjp
83589df77a Merge branch 'rockchip_master' into firefly-rk3288 2016-10-08 15:37:32 +08:00
4ac4f8d131 [frameworks/native] rk_ext: 3288 & 3288w only: add a path for libGLES_mali.so according to current SoC
Hardware revisions of mali_t760 in rk3288 and rk3288w are different,
so the mali_so's are different.
But the product_department requires that rk3288 and rk3288w must used a unified set of images.

With this commit, we can put the two mali_so's in a unified system_img,
in the path /system/vendor/lib/egl/rk3288/libGLES_mali.so and
./vendor/lib/egl/rk3288w/libGLES_mali.so,
and the image can support rk3288 and rk3288w both.

This only extends the process of searching libGLES_mali.so,
the default process has a higher priority.

Change-Id: Ib904e178e225a7848c5dc91378a1d58adad7137f
Signed-off-by: Firefly <service@t-firefly.com>
2016-10-08 15:08:58 +08:00
8222a80379 [frameworks/native] Fix force full screen when hdmi screen rotate
Signed-off-by: Firefly <service@t-firefly.com>
2016-10-08 15:08:52 +08:00
68061cf1e0 [frameworks/native] Remove unnecessary wifi utility
Signed-off-by: Firefly <service@t-firefly.com>
2016-10-08 15:08:45 +08:00
345a29abc5 [frameworks/native] fix memory leak bug 2016-10-08 15:08:39 +08:00
5dff62c2d2 [frameworks/native] add 3d displaying module for box 2016-10-08 15:08:33 +08:00
779c830a05 [frameworks/native] add support for 3d display screen capture 2016-10-08 15:08:27 +08:00
e949150690 [frameworks/native] fix color inversion bug when enable VR definition 2016-10-08 15:08:21 +08:00
a757f05fdc [frameworks/native] Add rk322x for force full screen for box platform 2016-10-08 15:08:15 +08:00
e552f697df [frameworks/native] Merge conflict--Add SN logging
Bug 27046057

Change-Id: Iede7c92e59e60795df1ec7768ebafd6b090f1c27
(cherry picked from commit 2d3f6d28e08a8168dad946cb45c4b4d662739391)
2016-10-08 15:08:08 +08:00
abd7938cad [frameworks/native] Sanity check IMemory access versus underlying mmap
Bug 26877992

Change-Id: Ibbf4b1061e4675e4e96bc944a865b53eaf6984fe
(cherry picked from commit 94b0d4e3ab023cfa03a7a4e85f3e09d3743da715)
2016-10-08 15:08:02 +08:00
76e4d66680 [frameworks/native] BQ: Add permission check to BufferQueueConsumer::dump
Bug 27046057

Change-Id: Id7bd8cf95045b497943ea39dde49e877aa6f5c4e
(cherry picked from commit 88f692852f99a7d0ae3990211d193b06ad209818)
2016-10-08 15:07:56 +08:00
cjp
ec5e22c526 Merge branch 'rockchip_master' into firefly-git
Conflicts:
	frameworks/base/packages/SystemUI/res/layout-sw720dp/navigation_bar_win.xml
	frameworks/base/packages/SystemUI/res/layout-sw800dp/navigation_bar_win.xml
	frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	hardware/rockchip/camera/Config/cam_board_rk3288.xml
	hardware/rockchip/camera/SiliconImage/isi/drv/TC358749XBG_MIPI_YUV/Android.mk
	hardware/rockchip/camera/SiliconImage/isi/drv/TC358749XBG_MIPI_YUV/include_priv/TC358749XBG_priv.h
	hardware/rockchip/camera/SiliconImage/isi/drv/TC358749XBG_MIPI_YUV/source/TC358749XBG_PARREL.c
	hardware/rockchip/camera/SiliconImage/isi/drv/TC358749XBG_MIPI_YUV/source/TC358749XBG_tables.c
	kernel/drivers/video/rockchip/Kconfig
	kernel/drivers/video/rockchip/Makefile
	packages/apps/Settings/res/values/strings.xml
	packages/apps/Settings/src/com/android/settings/dualscreen/DualscreenSettings.java
2016-07-08 11:57:40 +08:00
4a64517006 [frameworks/native] auto-detecting 3d video 2016-05-23 20:29:30 +08:00
ee3b580b57 [frameworks/native] IGraphicBufferProducer: fix QUEUE_BUFFER info leak
Bug: 26338109
Change-Id: I8a979469bfe1e317ebdefa43685e19f9302baea8
(cherry picked from commit d06421fd37fbb7fd07002e6738fac3a223cb1a62)
2016-05-23 20:29:24 +08:00
09bd3594ef [frameworks/native] IGraphicBufferConsumer: fix ATTACH_BUFFER info leak
Bug: 26338113
Change-Id: I019c4df2c6adbc944122df96968ddd11a02ebe33
(cherry picked from commit dded8fdbb700d6cc498debc69a780915bc34d755)
2016-05-23 20:29:18 +08:00
e0c952a051 [frameworks/native] Add support for 3d displaying HDMI 2016-05-23 20:29:12 +08:00
18171392bf [frameworks/native] surface:fix hand-write flicker 2016-05-23 20:29:06 +08:00
72d28f647a [frameworks/native] fix Bug: VR switch button delay 2016-05-23 20:29:00 +08:00
5eb8636e24 [frameworks/native] new branch modify for rk3366 2016-05-23 20:28:53 +08:00
b737aa3684 [frameworks/native] add 3d log option for debug 2016-05-23 20:28:47 +08:00
34644ab295 [frameworks/native] From: Firefly <service@t-firefly.com>
Date: Mon, 7 Sep 2015 15:28:58 +0800
Subject: [PATCH] add number constraint for samples per MotionEvent

Bug:23905002

Signed-off-by: Firefly <service@t-firefly.com>

(cherry picked from commit 552a8a5d8df32f659b8d11311a244cdc6d3b7733)

    Change-Id: I9b7ea859889b7697bee4165a2746602212120543
    (cherry picked from commit 5d17838adef13062717322e79d4db0b9bb6b2395)

Signed-off-by: Firefly <service@t-firefly.com>
2016-05-23 20:28:41 +08:00
1f4fea13d9 [frameworks/native] check when addDevices in EventHub to prevent add same inputdevices twice
Signed-off-by: Firefly <service@t-firefly.com>
2016-05-23 20:28:35 +08:00
6065b53679 [frameworks/native] remove third-party stabilizer.h file which is added before 2016-05-10 15:51:22 +08:00
1899a85586 [frameworks/native] add support for orient mode 1 2016-05-10 15:51:15 +08:00
612454cad0 [frameworks/native] Add define tag about VR 2016-05-10 15:51:09 +08:00
5a3ba055e5 [frameworks/native] Optimize 3D displaying functions 2016-05-10 15:51:03 +08:00
f82a33231d Android->Add recent key support 2016-01-05 11:50:05 +08:00
1ff3b43630 [frameworks/native] add dualscreen for box 2015-12-31 16:29:47 +08:00
de45bc5dc4 [frameworks/native] Initialize local variables to avoid data leak
The uninitialized local variables pick up
whatever the memory content was there on stack.
This data gets sent to the remote process in
case of a failed transaction, which is a security
issue. Fixed.

(Partial manual merge of master change
 12ba0f57d028a9c8f4eb3afddc326b70677d1e0c. Rest
 to automerge from klp-dev)

For b/23696300

Change-Id: I704c9fab327b3545c58e8a9a96ac542eb7469c2a
(cherry picked from commit b414255f53b560a06e642251535b019327ba0d7b)
2015-12-31 16:29:39 +08:00
1824f154b6 [frameworks/native] Initialize local variables to avoid data leak
The uninitialized local variables pick up
whatever the memory content was there on stack.
This data gets sent to the remote process in
case of a failed transaction, which is a security
issue. Fixed.

(Manual merge of master change
 12ba0f57d028a9c8f4eb3afddc326b70677d1e0c )

For b/23696300

Change-Id: I665212d10da56f0803b5bb772d14c77e632ba2ab
(cherry picked from commit c1e6fbb52c3f85cc7610d1d07d12be38f70b4ed4)
2015-12-31 16:29:31 +08:00
37f026873b [frameworks/native] fix IPD Bug in 3d displaying functions 2015-12-31 16:29:23 +08:00
79c26d56de [frameworks/native] Optimize 3d displaying functions 2015-12-31 16:29:15 +08:00
25f0a69d31 [frameworks/native] add 3d displaying functions 2015-12-31 16:29:06 +08:00
061c8b69bb [frameworks/native] Mouse: set right button as backkey only for BOX 2015-12-31 16:28:58 +08:00
8e6784e095 [frameworks/native] add office multiwindow 2015-12-31 16:28:50 +08:00
6a8c027e69 [frameworks/native] Fix new propety and return when hotplug NO_INIT 2015-12-31 16:28:42 +08:00
3f8870a135 Commit of manifest rk3288_box_lollipop_release.xml 2015-08-11 11:01:11 +08:00
93013a6efc Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml 2015-05-20 17:06:22 +08:00