Commit Graph

295 Commits

Author SHA1 Message Date
89735783fc Android->set default networkmode LTE 2017-03-21 10:42:17 +08:00
cjp
faab2348f5 Android->uvc:support uvc camera video 2017-03-07 10:08:58 +08:00
cfbea37129 Android->NtpTime:在同步时间时,加入台湾和美国的3个ntp服务器轮询 2016-11-25 16:50:17 +08:00
b223c82691 Android->Settings:关闭时区同步 2016-11-25 16:50:13 +08:00
c4d334a7d8 Android->SettingsProvider: 修改NTP服务器 2016-11-25 16:50:08 +08:00
cjp
3e3038cb26 Android->framework:fix btn default color 2016-10-26 17:40:55 +08:00
15807170cb Android->DeviceTest:add first time boot go to DeviceTest 2016-10-13 10:58:12 +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
5ca51fd184 frameworks->config: enable config_useDevInputEventForAudioJack 2016-08-20 11:34:36 +08:00
cjp
26b7b5e1d7 Android->framework:fix dual screen icon can not show 2016-07-11 16:17:22 +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
sjf
5d164df41b Android->Eth:fix can not save static ip 2016-06-15 15:12:54 +08:00
0c44cff337 [frameworks/opt/telephony] Check permissions on getDeviceId.
bug:25778215
Change-Id: Ie27d69e558a8132f6e0c5058aaad1a4ae02bf82f
(cherry picked from commit 79eecef63f3ea99688333c19e22813f54d4a31b1)
2016-05-23 20:29:58 +08:00
b89d292ce4 [frameworks/opt/net/wifi] add for wfd function 2016-05-23 20:29:47 +08:00
849d1bcaf1 [frameworks/opt/net/wifi] Fix a race in WifiNative objects
disconnectFromSupplicant doesn't have any synchronization;
so it can cause problems when WifiStateMachine is disconnecting
and P2p statemachine is sending commands.

Bug: 22667667
Change-Id: I92e6ee44618813341e171f84442791a6403a5010
(cherry picked from commit b577f391af2c484e443c19b3df1d62cc0924692a)
(cherry picked from commit 8b41627f7411306a0c42867fb526fa214f2991cd)
2016-05-23 20:29:41 +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
e8e3379b30 [frameworks/minikin] From e680f20c9c85dd423839aa7af8c9d013508b169d Mon Sep 17 00:00:00 2001
From: Firefly <service@t-firefly.com>
Date: Mon, 30 Nov 2015 15:04:59 -0800
Subject: [PATCH] Avoid integer overflows in parsing fonts

A malformed TTF can cause size calculations to overflow. This patch
checks the maximum reasonable value so that the total size fits in 32
bits. It also adds some explicit casting to avoid possible technical
undefined behavior when parsing sized unsigned values.

Bug: 25645298
Change-Id: Id4716132041a6f4f1fbb73ec4e445391cf7d9616
(cherry picked from commit 183c9ec2800baa2ce099ee260c6cbc6121cf1274)
    (cherry picked from commit 6299a6ba13906c695f7a4f6748f7bc5856a110e5)

Signed-off-by: Firefly <service@t-firefly.com>
2016-05-23 20:28:23 +08:00
a340eef03f [frameworks/base] fix Bug: VR switch button delay 2016-05-23 20:28:12 +08:00
89f7b50ba3 [frameworks/base] support wfd sink for box version1.0 2016-05-23 20:28:06 +08:00
9cd14fc2ef [frameworks/base] dont start window when enbaled multiwindow 2016-05-23 20:28:00 +08:00
0c6720a065 [frameworks/base] fix error in 3307991f49f820757bc1ad074841d3dfed3876b9
Signed-off-by: Firefly <service@t-firefly.com>
2016-05-23 20:27:54 +08:00
5bd3ddcb4d [frameworks/base] add mem optimise for 1G ddr machine,controlled by BOARD_WITH_MEM_OPTIMISE in BoardConfig.xml
Signed-off-by: Firefly <service@t-firefly.com>
2016-05-23 20:27:47 +08:00
19ac305691 [frameworks/base] From 0fdfb301e73f85b9db2fa4ce6ee8349acebd06be Mon Sep 17 00:00:00 2001
From: Firefly <service@t-firefly.com>
Date: Fri, 13 Nov 2015 21:52:18 +0000
Subject: [PATCH 2/2] DO NOT MERGE. Prevent recents from coming up when in SUW

Bug: 25229538
Change-Id: If4f276d3f7c04fd89011068d90a3c3c60593bc05
(cherry picked from commit 84669ca8de55d38073a0dcb01074233b0a417541)

Signed-off-by: Firefly <service@t-firefly.com>
2016-05-23 20:27:41 +08:00
b3fe9ba71a [frameworks/base] From 5e834aed18b70f2b2af86c5a4a0a3b6873aea5f4 Mon Sep 17 00:00:00 2001
From: Firefly <service@t-firefly.com>
Date: Tue, 10 Nov 2015 16:19:38 -0800
Subject: [PATCH 1/2] DO NOT MERGE Ensure that the device is provisioned before
 showing Recents.

 Bug: 25476219
 Change-Id: I5bb9cca74790521de71c0037b4f2421c3d21b3f6
 (cherry picked from commit 16a76dadcc23a13223e9c2216dad1fe5cad7d6e1)

Signed-off-by: Firefly <service@t-firefly.com>
2016-05-23 20:27:35 +08:00
52eaa643e9 [frameworks/base] fix java.lang.NullPointerException
"Attempt to invoke virtual method
  'java.lang.String android.content.ComponentName.flattenToShortString()' on a null object reference"
at com.android.server.wm.WindowManagerService.addAppToken(WindowManagerService.java:4532)
2016-05-23 20:27:29 +08:00
038e08077a [frameworks/base] update new api for multiwindow jar
v4.0
2016-05-23 20:27:23 +08:00
70125c9a13 [frameworks/base] Add AudioTrack MODE_STREAM_DIRECT mode to enable passthrough through framework 2016-05-23 20:27:16 +08:00
bd3e59f278 [frameworks/base] Set AudioTrack SAMPLE_RATE_HZ_MAX = 192000 2016-05-23 20:27:10 +08:00
dfdbb06d89 [frameworks/base] MultiWindow:surpport longpress Home button for deep cleaning processes 2016-05-23 20:27:04 +08:00
ae4e7bbca6 [frameworks/base] MultiWindow SystemUI:default show notification on HeadsUpNotificationView,fix Calendar 2016-05-23 20:26:58 +08:00