gaoyang3513/SDK_RK3288
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,219 Commits 2 Branches 0 Tags
ec5e22c5266ec4ea1d725d7277f6ca693f0b5657
Commit Graph

1219 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Firefly
8a4637332b modify multiwindow 2016-06-24 16:02:02 +08:00
Firefly
4ba54904d9 only 3288 can use MultiWindow 2016-06-24 16:01:50 +08:00
Firefly
579b204dcc add multiwindow control 2016-06-24 16:00:13 +08:00
Firefly
d1dd0d369b add dual screen function 2016-06-24 16:00:03 +08:00
cjp
7bebe1667f Android->DeviceTest:fix iperf wifi test connect issue 2016-06-23 14:52:14 +08:00
linjc
4e4e3f2d79 Android->DeviceTest:fix adb disconnect sometimes 2016-06-22 16:26:37 +08:00
linjc
de4968ef24 Kernel->uart:open uart1 and uart3 2016-06-21 17:34:39 +08:00
linjc
7f0a5443c8 Kernel->uart:uart support to change the speed 2016-06-21 17:33:04 +08:00
linjc
bb2af00d80 Kernel->defconfig:ubuntu support nfs 2016-06-21 11:05:25 +08:00
linjc
3fecf7428d Kernel->iommu:ubuntu do not use iommu 2016-06-16 17:07:26 +08:00
sjf
5d164df41b Android->Eth:fix can not save static ip 2016-06-15 15:12:54 +08:00
cjp
5b6843a2fd [hardware/rockchip/hwcomposer] Merge v2.07_20160418 2016-05-24 16:59:11 +08:00
cjp
b7f473b5de [packages/apps/Settings] Merge v2.07_20160418 2016-05-24 16:47:07 +08:00
Firefly
8a93337635 [packages/apps/Settings] fix spelling error: Ehernet -> Ethernet 2016-05-24 11:52:02 +08:00
Firefly
76b761501f [packages/apps/Settings] Preserve FRP lock if wiped during SUW 
Guard against FRP attacks by keeping the persistent data block
intact, if a factory reset has been issued during SUW.

Bug: 25290269
Change-Id: Id26b4c10235ad126632b71875592a4fa70a39b24
(cherry picked from commit 14bf226c79ee16fc5dd502d81e12bf18b932f39e)
 2016-05-24 11:50:03 +08:00
Firefly
4d3782b67d [packages/apps/Settings] Block developer settings during SUW 
Block access to development settings by tapping on the build number
in "About phone". Once SUW has completed, taps will be allowed.

Bug: 25290269
Change-Id: I9b2787712237f28fba446abab15a9e1c075d0419
(cherry picked from commit 4836ab6df4d4e82f6b2839b6b9faf3e794d66d5f)
 2016-05-24 11:49:53 +08:00
Firefly
5407bf5a48 [packages/apps/Settings] fix bug: bt can not be foud after reopen bt in BluetoothSettings Activity 2016-05-24 11:49:42 +08:00
Firefly
5d7d847b78 [vendor/rockchip/common] solve camerarecord broken screen 
Signed-off-by: Firefly <service@t-firefly.com>
 2016-05-23 21:03:00 +08:00
Firefly
661cfc8748 [vendor/rockchip/common] sofia3gr_car:optimization file ftyp box write avoid dropping frame happen 
Signed-off-by: Firefly <service@t-firefly.com>
 2016-05-23 21:02:54 +08:00
Firefly
4ffe640891 [vendor/rockchip/common] fix rk322x libGLES_mali.so copy mistake 2016-05-23 21:02:48 +08:00
Firefly
7de9d8e929 [vendor/rockchip/common] sofia3gr_car:update libdrivingrecoder.so 
Signed-off-by: Firefly <service@t-firefly.com>
 2016-05-23 21:02:42 +08:00
Firefly
34350a449a [vendor/rockchip/common] Update RkBoxVideoPlayer.apk version 2016-05-23 21:02:36 +08:00
Firefly
37f82b33f4 [vendor/rockchip/common] sofia3gr:RKUpdateService.apk:1.8.7: commit again, support multi sdcard ota. 
Signed-off-by: Firefly <service@t-firefly.com>
 2016-05-23 21:02:30 +08:00
Firefly
827464f2a9 [vendor/rockchip/common] Revert "sofia3gr:RKUpdateService.apk:1.8.7: support multi sdcard ota update." 
This reverts commit c726f7368454aa833d4e9d4eb4f267233d3bb8db.
 2016-05-23 21:02:23 +08:00
Firefly
e73d35e7fe [vendor/rockchip/common] gpu: mali_so_for_322x: custom_release_9 for 3228_5.1_box on r6p0-01rel1-x-3@0. 
fix the browser crash when visiting "baidu video" page.
 2016-05-23 21:02:17 +08:00
Firefly
0a2a825766 [vendor/rockchip/common] update rkffplayer for 5.1 rk3228 2016-05-23 21:02:11 +08:00
Firefly
876948ab96 [vendor/rockchip/common] Update vpu lib version 
Update RKBoxVideoPlayer APK
 2016-05-23 21:02:05 +08:00
Firefly
6c0a15a52d [vendor/rockchip/common] sofia3gr:RKUpdateService.apk:1.8.7: support multi sdcard ota update. 
Signed-off-by: Firefly <service@t-firefly.com>
 2016-05-23 21:01:58 +08:00
Firefly
561359594d [vendor/rockchip/common] update ffplayer and ffmpeg for 312x/3288 2016-05-23 21:01:52 +08:00
Firefly
b83aee5188 [vendor/rockchip/common] add vpu library for rk322x 2016-05-23 21:01:46 +08:00
Firefly
14ee287247 [vendor/rockchip/common] gpu: rebuild mali_400_so of r6p0-01rel1-x-3@0 for 312x_5.1_sdk. 2016-05-23 21:01:39 +08:00
Firefly
7a4c3ea35a [vendor/rockchip/common] Modify videoPlayer can't full screen on BOX device 
Change-Id: I563682ba61d7fbfdb0ad874784850a44d8f7d194
 2016-05-23 21:01:33 +08:00
Firefly
e9ed034587 [vendor/rockchip/common] RK3368 GPU version: UK L0.28 
Update G6110_32
1. Fix 3DMark crash and splash bug.
2. Auto get last commit message.
 2016-05-23 21:01:27 +08:00
Firefly
304262d4d3 [vendor/rockchip/common] fix kernel error 
Signed-off-by: Firefly <service@t-firefly.com>
 2016-05-23 21:01:20 +08:00
Firefly
5e73e7c1db [vendor/rockchip/common] jpeg enc v0.0.d: fix yv12 2016-05-23 21:01:14 +08:00
Firefly
3a37a85352 [vendor/rockchip/common] rk3368: update newest multimedia library 2016-05-23 21:01:08 +08:00
Firefly
f4675e7963 [vendor/rockchip/common] gpu: mali_400_so: 
Rebuild mali_so_for_3228_5.1_box under android_5.1,
because the definitions of some pixel formats are different from android_4.4.o
 2016-05-23 21:01:01 +08:00
Firefly
06661b5d2d [vendor/rockchip/common] sofia3gr_car:support file rename,file image num notify and driving encoder 
Signed-off-by: Firefly <service@t-firefly.com>
 2016-05-23 21:00:55 +08:00
Firefly
eb30796863 [vendor/rockchip/common] modify for compile wrong because of re-define for wfd 2016-05-23 21:00:49 +08:00
Firefly
706ba26f84 [vendor/rockchip/common] vpu: add rk322x 2016-05-23 21:00:42 +08:00
Firefly
7a6ec8d72f [vendor/rockchip/common] gpu: add libGLES_mali.so for rk322x 2016-05-23 21:00:36 +08:00
Firefly
a112e0a8f2 [vendor/rockchip/common] sofia3gr:fix paused by focurs changed state not change 
Signed-off-by: Firefly <service@t-firefly.com>
 2016-05-23 21:00:30 +08:00
Firefly
1da8c57415 [vendor/rockchip/common] update mali gpu userspace driver to version 1.12. 
1. Fix some GLES2 cts failures.
2. Close RGB_IS_XRGB.
 2016-05-23 21:00:24 +08:00
Firefly
4426213387 [vendor/rockchip/common] sofia3gr:add thermal apk for car 2016-05-23 21:00:18 +08:00
Firefly
c04d796893 [vendor/rockchip/common] Rk3grExplorer_car.apk : update to support separate partition. 
Signed-off-by: Firefly <service@t-firefly.com>
 2016-05-23 21:00:11 +08:00
Firefly
6a27080cf2 [vendor/rockchip/common] RK3368 GPU version: KM L0.23 
Update G6110_32
1. Fix RGXCheckFirmwareCCBs crash bug.
2. Adjust gpu setting frequency sequence.
 2016-05-23 21:00:05 +08:00
Firefly
c3b898de04 [vendor/rockchip/common] sofia3gr_car:improve avc encoder quality(sync for svn) 
Signed-off-by: Firefly <service@t-firefly.com>
 2016-05-23 20:59:59 +08:00
Firefly
eae01a6537 [vendor/rockchip/common] sofia3gr_car:fix cannot conectaudio to phone from car(FROM LLJ) 
Signed-off-by: Firefly <service@t-firefly.com>
 2016-05-23 20:59:53 +08:00
Firefly
74794c8e2f [vendor/rockchip/common] Sofia3gr:disable kernel thermal dynamic,add app version name. 2016-05-23 20:59:47 +08:00