8b91460cc2
Android->System:fix switch Ubuntu
2016-01-09 09:18:25 +08:00
8280196215
Android->Add switch Ubuntu and sleep support
2016-01-05 11:52:22 +08:00
5d194e2bf1
Android->HDMIIN:add HDMIIN pip key support
2016-01-05 11:51:14 +08:00
55a1882b24
Android->CameraHal:add 3 camera Support
2016-01-05 11:50:59 +08:00
94016e5a1c
Android->SystemUI:add soft power off button
2016-01-05 11:50:19 +08:00
de329ee2ec
Android->fixed recent view scroll loop
2016-01-05 11:50:09 +08:00
f82a33231d
Android->Add recent key support
2016-01-05 11:50:05 +08:00
aaaf6d549b
A->base: Update default wallpaper
2016-01-04 09:39:57 +08:00
4e50e1a4d7
A->framework:open FF player
2015-12-31 18:15:20 +08:00
9ae9ab2e79
A->framework:modify phonewindow file issue
2015-12-31 18:15:15 +08:00
2b5f44213a
Merge master branch.
...
Conflicts:
frameworks/base/core/java/android/content/res/Configuration.java
frameworks/base/core/java/android/provider/Settings.java
frameworks/base/packages/SettingsProvider/res/values/defaults.xml
frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/SystemBars.java
frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
frameworks/base/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
frameworks/base/services/core/java/com/android/server/wm/WindowManagerService.java
hardware/rockchip/camera/CameraHal/CameraHal_board_xml_parse.cpp
vendor/rockchip/common/apps/apps.mk
2015-12-31 17:54:05 +08:00
2893affdfc
[frameworks/opt/telephony] Fix NOT_RESTRICTED network capability and enforce it.
...
With this change:
1. NOT_RESTRICTED should be removed from NetworkRequests that bring up
special restricted carrier networks (e.g. IMS, FOTA).
2. NetworkRequests without NOT_RESTRICTED require CONNECTIVITY_INTERNAL
permission to register
3. Binding sockets to networks without NOT_RESTRICTED requires
CONNECTIVITY_INTERNAL permission
Bug:21900139
Change-Id: I5991d39facaa6b690e969fe15dcbeec52e918321
(cherry picked from commit af171aa4dcf294bf2d1b9bed54ef9a6b0ec76361)
2015-12-31 16:31:16 +08:00
92d1eda6b1
[frameworks/opt/telephony] telephony: add a column for whether APN editable
...
Defined a column name for carriers table in telephoy.db.
It controls whether APN editable.
Issue:GRANITEFLY-744
Change-Id: I618efbf89064ab0011351cc0256ee8ee908760f9
Signed-off-by: Firefly <service@t-firefly.com >
2015-12-31 16:31:08 +08:00
cd39ebaf90
[frameworks/opt/net/wifi] Revert "Wlan: add wifi power saver, prompt user to turn off wifi for reduce power consumption when no available AP around."
...
This reverts commit 73c959cc44f2fec2bc708d8acab675f8537fcb05.
2015-12-31 16:31:00 +08:00
b504b9712a
[frameworks/opt/net/wifi] Wlan: add wifi power saver, prompt user to turn off wifi for reduce power consumption when no available AP around.
...
Signed-off-by: Firefly <service@t-firefly.com >
2015-12-31 16:30:52 +08:00
087d3f948f
[frameworks/opt/net/wifi] P2P: modify to work compatibly for some WFD sink devices which unsupport invitation.
...
Signed-off-by: Firefly <service@t-firefly.com >
2015-12-31 16:30:44 +08:00
7d7cd1c937
[frameworks/opt/net/wifi] wlan: disable auto join to save new config just match first 3 characters of SSID. Hooliganism.
...
Signed-off-by: Firefly <service@t-firefly.com >
2015-12-31 16:30:36 +08:00
97664bf656
[frameworks/opt/net/wifi] Do gateway and dnsaddress null point check for network checker.
...
Signed-off-by: Firefly <service@t-firefly.com >
2015-12-31 16:30:28 +08:00
29738f5914
[frameworks/opt/net/wifi] P2P: modify wifi scan period to 30min if p2p connected.
2015-12-31 16:30:19 +08:00
8f8e7ba3ee
[frameworks/opt/net/wifi] Wlan: add wifi network checker to monitor network.
2015-12-31 16:30:11 +08:00
c99fd69ec4
[frameworks/opt/net/pppoe] pppoe自动连接,在以下情况下自动触发:
...
1.系统pppoe连接成功后,拔掉网线后,又插上网线的时候.
2.系统pppoe连接成功后,关机,开机的时候.
系统在以下情况下关闭自动拨号.
1.连接成功后,手动关闭pppoe
2.自动拨号失败以后
2015-12-31 16:30:03 +08:00
13d2d5a6a6
[frameworks/opt/net/pppoe] Increase pppoe's NETWORK_SCROE ,which has a more priority than other
...
network ,such as Ethernet,wifi
2015-12-31 16:29:55 +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
40bd591d49
[frameworks/base] fix SystemUI
2015-12-31 16:28:34 +08:00
55c683b522
[frameworks/base] add dualscreen for box and resume the volume add icon
2015-12-31 16:28:26 +08:00
13929574fc
[frameworks/base] update multiwindow jar
...
v3.0
2015-12-31 16:28:18 +08:00
0b156bf714
[frameworks/base] chmod 755 for multiwindowcore.jar
2015-12-31 16:28:10 +08:00
49e2924771
[frameworks/base] update multiwindow jar
...
v2.0
2015-12-31 16:28:02 +08:00
ad31308429
[frameworks/base] update multiwindow jar
2015-12-31 16:27:54 +08:00
986ee59d70
[frameworks/base] change the sync icon for dualscreen function on multiwindow mode
2015-12-31 16:27:45 +08:00
edadf40869
[frameworks/base] add new button in the multi-view for dual screen
2015-12-31 16:27:37 +08:00
04017dd3dc
[frameworks/base] when on the time of multiwindow mode add dualscreen icon at the top of window title
2015-12-31 16:27:29 +08:00
4a9ea5cc05
[frameworks/base] 修改app的兼容性问题
2015-12-31 16:27:21 +08:00
30e3ba5da9
[frameworks/base] to perfect the code for dual screen
2015-12-31 16:27:13 +08:00
8ac97a82d5
[frameworks/base] make the app showing full screen on the second screen although it's frame isn't full on the main screen
...
Signed-off-by: Firefly <service@t-firefly.com >
2015-12-31 16:27:05 +08:00
abcc15f623
[frameworks/base] avoid com.android.phone being killed for 3g dongle
...
Signed-off-by: Firefly <service@t-firefly.com >
2015-12-31 16:26:57 +08:00
7402744da7
[frameworks/base] modify the repeated action
2015-12-31 16:26:49 +08:00
fc55a2b616
[frameworks/base] resume the second screen's display
2015-12-31 16:26:41 +08:00
0a34f3a921
[frameworks/base] 添加任务栏切换
...
修改半屏位置问题
2015-12-31 16:26:32 +08:00
3c0e484f9c
[frameworks/base] Merge branch 'rk32/mid/5.1/develop' of ssh://10.10.10.29/platform/frameworks/base into rk32/mid/5.1/develop
2015-12-31 16:26:22 +08:00
e5b0bbf255
[frameworks/base] Merge branch 'rk32/mid/5.1/develop' of ssh://10.10.10.29/platform/frameworks/base into zjwork
2015-12-31 16:26:16 +08:00
6ef006619b
[frameworks/base] DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
...
b/23946860
Change-Id: I610d4dedf18fe1825d7df5febf29e6f0c006490d
(cherry picked from commit 1cf21e443aaf207b962f50169be28c0babe71f61)
(cherry picked from commit 6f0f50ba74e4f0099e9db06c6da31101925b0ad0)
2015-12-31 16:26:11 +08:00
