Commit Graph

29 Commits

Author SHA1 Message Date
djw
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
cf9e42b4f6 [system/vold] fix: vold crash 2015-12-31 16:54:23 +08:00
6ce4b790be [system/vold] fix :vold crash by umount process 2015-12-31 16:54:15 +08:00
16ee7c08e3 [system/vold] fix remove volume do umount alway return true 2015-12-31 16:54:07 +08:00
229a7e0364 [system/vold] Fix ld error for vold
Signed-off-by: Firefly <service@t-firefly.com>
(cherry picked from commit 0b3e9b18c17aae7519ac9b793ad2422d361a3271)
2015-12-31 16:53:59 +08:00
eb757ad20f [system/vold] Revert "App2Sd support ."
This reverts commit 8034f0cd8536a275df53bdfe2da39a46a0679e62.
2015-12-31 16:53:51 +08:00
b51b0861b4 [system/vold] App2Sd support . 2015-12-31 16:53:42 +08:00
f8e52a9a29 [system/security] Merge tag 'android-5.1.1_r24' into dev
Android 5.1.1 release 24

Conflicts:
	keystore/keystore.cpp
2015-12-31 16:53:34 +08:00
1198650d7e [system/security] From cc2c83e7565813d6ce67a67aae9427a8682198e5 Mon Sep 17 00:00:00 2001
From: Firefly <service@t-firefly.com>
Date: Wed, 12 Aug 2015 13:40:31 -0700
Subject: [PATCH] Properly check for Blob max length
sizeof(mBlob.value) is incorrect because writeBlob pads up to the nextAES_BLOCK_SIZE

Bug:22802399
Change-Id: I377edca2c7ea2cf4455f22f5f927fdad79893729
Signed-off-by: Firefly <service@t-firefly.com>
2015-12-31 16:53:26 +08:00
7cd2eb335b [system/displayd] aux display resolution set by android
Signed-off-by: Firefly <service@t-firefly.com>
2015-12-31 16:53:18 +08:00
f6d3ce6476 [system/displayd] modify process, avoid being closed and reopen when CVBS display
Signed-off-by: Firefly <service@t-firefly.com>
2015-12-31 16:53:10 +08:00
3df6a78831 [system/core] libutils: Fix integer overflows in VectorImpl.
Use external/safe-iop to check for overflows on arithmetic
operations.

Also remove an unnecessary copy of Vector/SharedBuffer from
codeflinger and use the copy from libutils instead.

Note that some of the unit tests are somewhat useless due to
test-runner limitations : gtest's ability to filter on abort message
doesn't work when combined with messages formatted by android's logging
system.

bug: 22953624

(cherry picked from commit c609c31fb56ae434caa2d0153cd0a2f74a715071)

Change-Id: I61644633db6b54fa230683615de9724f7fabf6fb
2015-12-31 16:53:01 +08:00
533f28193e [system/core] libutils: fix overflow in String8::allocFromUTF8
Patch contributed in:
https://code.google.com/p/android/issues/detail?id=182908

Bug: 23290056

(cherry picked from commit 4eeacbeec0ae66e9d9395abbf83666709f2e11e3)

Change-Id: Ife1dc0791040150132bea6884f1e6c8d31972d1b
(cherry picked from commit ebabef275283f771151ec93c17469374b789b2c8)

Signed-off-by: Firefly <service@t-firefly.com>
2015-12-31 16:52:53 +08:00
71573fe208 [system/core] libutils: fix overflow in SharedBuffer [DO NOT MERGE]
See
https://code.google.com/p/android/issues/detail?id=181910

Bug: 22952485
(cherry picked from commit 66b6eb9490beeeabc804d790c1c4060ce047afd4)

Change-Id: Ic71dd0025b9a7588c4f3bb1c7be1bd13d2ff5105

Signed-off-by: Firefly <service@t-firefly.com>
2015-12-31 16:52:45 +08:00
c64a4791f1 [system/core] Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
Bug: 23290056
Change-Id: If6e22b0159de6635a8ca5305895b7718f15becc7

Signed-off-by: Firefly <service@t-firefly.com>
2015-12-31 16:52:37 +08:00
8490f28bff [system/core] Merge tag 'android-5.1.1_r13' into HEAD
Android 5.1.1 release 13

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

Conflicts:
	fs_mgr/fs_mgr_priv.h
2015-12-31 16:52:28 +08:00
cd64a7531b [system/core] healthd: charger: use images to display current capacity text
Add images to make up the value of capacity to make the size of
text bigger.

Also adds support display capacity text on four direction:
 - if the resolution of charging animation image is horizontal,
   the capacity text display on the top of charging animation image,
   but on the bottom if CHARGER_CAPACITY_TEXT_ROTATE_180 is selected;
 - and if the resolution of charging animation image is vertical,
   the capacity text display on the right of charing animation image,
   but on the left if CHARGER_CAPACITY_TEXT_ROTATE_180 is selected.

Signed-off-by: Firefly <service@t-firefly.com>
2015-12-31 16:52:20 +08:00
9a8107a0ed [system/core] healthd: charger: support display current capacity text
Signed-off-by: Firefly <service@t-firefly.com>
2015-12-31 16:52:12 +08:00
2de3bbce37 [system/core] Revert "remove pixelflinger from healthd"
Use a few battery_*.png images to offer a more general
way of storing and loading frames of animation.

Also adds the battery_*.png image and removes the unused
battery_scale.png image.

Signed-off-by: Firefly <service@t-firefly.com>
2015-12-31 16:52:04 +08:00
13097eaccf [system/core] CGROUP : Fix duplicate setting the same policy
Get current schedule policy first before setting.

Signed-off-by: Firefly <service@t-firefly.com>
2015-12-31 16:51:55 +08:00
5cae4392b4 [system/core] healthd: remove EPOLLWAKEUP flag for epoll events
kernel will send wakeup events before enter suspend
mode if EPOLLWAKEUP flag set, this will prevent the
system from suspending

Signed-off-by: Firefly <service@t-firefly.com>
2015-12-31 16:51:47 +08:00
7b24108a67 [system/core] core: workaround to limited support bangcle free edition protection
This workaround provides the limited support apps of which dex files are
protected by bangcle free edition protection.

NOTE: Must be merged together with following workaround:
      https://android.intel.com/#/c/394523/
      https://android.intel.com/#/c/394524/
      https://android.intel.com/#/c/394526/

Change-Id: I876330738cbe0f10819e8be961f61f8011258d4b
Tracked-On: https://jira01.devtools.intel.com/browse/IMINAN-38665
Signed-off-by: Firefly <service@t-firefly.com>
2015-12-31 16:51:39 +08:00
a760d6235d [system/core] LibNativeBridge: Version 2
Add a callback function to retrieve "signal handler" from the bridge,
if the bridge wants it to be managed by the runtime. The signal handler
will be invoked after the runtime's own one, and before any other
chained handler.
Add a callback function to check compatibility of the bridge with the
library.
Add a function to expose the native bridge version. Add a test for this
function.
Google Bug 20217701
Google Change Id Ic23a60b949f119c7d8b0e7cb27a61e6c16532a23

Change-Id: Ia3a51ee5d7ca6523d66301a5353c0ab749132f54
Category: aosp improvement
Domain: AOSP-Framework-CoreService
Origin: 3rd-party Google
Upstream-Candidate: no, proprietary
Signed-off-by: Firefly <service@t-firefly.com>
2015-12-31 16:51:30 +08:00
d373c36c82 [system/core] Revert "LibNativeBridge: Version 2"
This reverts commit 8093a94f4649fd0b2332713c56770f210d0ad438.
2015-12-31 16:51:22 +08:00
503b3e9bc9 [system/core] LibNativeBridge: Version 2
Add a callback function to retrieve "signal handler" from the bridge,
if the bridge wants it to be managed by the runtime. The signal handler
will be invoked after the runtime's own one, and before any other
chained handler.
Add a callback function to check compatibility of the bridge with the
library.
Add a function to expose the native bridge version. Add a test for this
function.
Google Bug 20217701
Google Change Id Ic23a60b949f119c7d8b0e7cb27a61e6c16532a23

Change-Id: Ia3a51ee5d7ca6523d66301a5353c0ab749132f54
Category: aosp improvement
Domain: AOSP-Framework-CoreService
Origin: 3rd-party Google
Upstream-Candidate: no, proprietary
Signed-off-by: Firefly <service@t-firefly.com>
2015-12-31 16:51:14 +08:00
cjp
7fa7bca412 A->base:add base firefly setting 2015-09-08 17:10:05 +08:00
ded6e6f7c7 A->framwork:make vga and hdmi switch function 2015-08-20 15:20:45 +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