OSDN Git Service
Grzegorz Kolodziejczyk [Wed, 30 Jul 2014 09:14:22 +0000 (11:14 +0200)]
Fix Bluetooth tethering
Ignore linkstate down events for bt-pan interface which cause its remove.
Interface should only be removed when we receive the interface remove event.
At connect init to bluetooth PAN service, bridge pan device adds tetherable
bt-pan interface as set in bluetooth regexs. Before bt-pan interface gets
tethered, multiple linkstate events are received by linkstate change notifier.
Receiving multiple time of linkstate down may cause remove of tetherable
interface (bt-pan), before we call tether method.
Finally when tethering method is called and bt-pan tether interface
is removed, error is returned because of not available tetherable interfaces.
Bug found during bluetooth PTS PAN testing. It affects multiple test cases.
Change-Id: Ifb0d16657ca238aa62064fee0fc4ee974a2518ad
Andrzej Kaczmarek [Tue, 11 Mar 2014 07:40:44 +0000 (08:40 +0100)]
AudioService: Fix absolute volume for AVRCP
Avrcp.java uses max volume obtained by getStreamMaxVolume() when
converting to AVRCP levels and it returns non-scaled volume index.
For this reason volume index needs to be dispatched to Avrcp before
scaling as otherwise Avrcp will convert volume level incorrectly,
i.e. max volume index for music stream is 15 and any volume index
>1 (>10 after scaling) will result in setting *MAXIMUM* volume level
on headset which is not safe for listener.
Change-Id: Ia799eec578ed2326ec18b69f2ee4f2a60c664514
sean_lu [Mon, 16 Jun 2014 07:11:29 +0000 (15:11 +0800)]
Fix memory leakage bug
Symptom: memory leakage
Root Cause: new SortedVector but not free it in native cpp
Solution: free the SortedVector
Project: AOSP
Note:
Change-Id: Iab5a7f2e8d8509631301e7231427927d4797c856
riddle_hsu [Mon, 7 Apr 2014 18:44:03 +0000 (02:44 +0800)]
Reduce report ANR on wrong activity.
Symptom: ANR report on wrong activity.
Root Cause:
KK changed resume behavior that will not update focus when only resume,
if the activity blocked, it may report ANR on previous focus.
By original concept, it will try to correct the ANR target,
but the stack of waiting(waitingVisible=true) activity may
different with current top stack.
If it gets key dispatch timeout, mResumedActivity and mPausingActivity
of its stack will be null becuase it is not top stack.
Then it is unable to change ANR target to the real no response activity.
Solution:
Use focused stack to get the real culprit.
Reproduce steps:
1.Launch an Activity X from launcher, press home key.
2.Launch X from launcher again, X blocks(sleeps 15sec) in onResume, press back key in the beginning of blocking duration.
3.ANR dialog shows launcher is no response.
Change-Id: I99416ad91e349096f995990f2240a97616fbaf28
leo_hsu [Fri, 21 Mar 2014 04:27:16 +0000 (12:27 +0800)]
Fix a bug: unable to start activity after starting activities during screen off.
Symptom: Unable to start any activity.
Root Cause: ActivityStack.mPausingActivity() points to a destroyed activity of a died process, so that ActivityStackSupervisor.allPausedActivitiesComplete() always returns false.
Solution: Set mPausingActivity to null in ActivityStack.cleanUpActivityLocked().
Reproduce steps:
a. Turn screen off.
b. A background service starts an activity X (in process X).
c. A background service starts a no-history activity Y (in process Y), but the main thread of Y was blocked.
d. A background service starts Y 3~4 times --> this causes am_failed_to_pause on X.
e. Main thread of Y is freed finally --> this causes Y crash for android.view.WindowManager$BadTokenException.
f. Turn screen on, X is shown on screen, but neither back key nor home key can work because mPausingActivity is Y.
Change-Id: I320b3db407e2d4cc745c8ca22a6e548742234242
riddle_hsu [Thu, 9 Jan 2014 12:24:34 +0000 (20:24 +0800)]
Fix visibility of multiple non-fullscreen activities.
Issue detail:
Assume X, Y are non-fullscreen activities.
a.Home starts an activity X in task A in application stack.
b.X starts an activity Y in <task A> or <new task B>
c.Activity X will be invisible.
How to fix:
Because the function "isActivityOverHome" means an activity is able to see home.
But there may have many non-fullscreen activities between the top non-fullscreen activity and home.
If flag "behindFullscreen" is set, those middle activities will be invisible.
So it should only take care from who is adjacent to home.
Then check two flags frontOfTask(task root) and mOnTopOfHome for constraining the condition.
Change-Id: I60bcea304976414e44835a0a38675aae365e9e19
Sangkyu Lee [Thu, 21 Nov 2013 06:20:33 +0000 (15:20 +0900)]
Make SurfaceView layers captured by screenshotApplications()
Since SurfaceView layers are located below application layers,
SurfaceView is not captured by screenshotApplications()
when the application is running in fullscreen.
Moreover, ws.isFullscreen(dw, dh) returns mostly true
on the devices which do not use the navigation bar.
Change-Id: Ia1036c79054950384a97504714929fd85c8147de
Signed-off-by: Sangkyu Lee <sk82.lee@lge.com>
Chih-Wei Huang [Wed, 30 Jul 2014 07:52:02 +0000 (15:52 +0800)]
Generic.kl: map key for APP_SWITCH and unmap key 143
Map the menu key to the recent apps function since it's more useful.
Unmap key 143 because it's the Fn key on many Lenovo laptops, not a
power key. There doesn't seem to be other laptops which use 143 for
power key.
Chih-Wei Huang [Sat, 17 May 2014 18:20:32 +0000 (02:20 +0800)]
InputReader: read the pointercal from TSCalibration2
Watch the pointercal and reload it on changed.
Chih-Wei Huang [Fri, 2 May 2014 17:13:11 +0000 (01:13 +0800)]
Fix IMMERSIVE_MODE_CONFIRMATIONS registration
The changes of IMMERSIVE_MODE_CONFIRMATIONS are not observed
since the SettingsObserver doesn't register it correctly.
Change-Id: I538012a7c0058103d1c9096d76e5c24c0eddea6a
Kyle Evans [Mon, 3 Mar 2014 15:05:15 +0000 (10:05 -0500)]
PowerManagerService: disable display blanking on suspend
workaround for a black screen that SurfaceFlinger never recovers from.
Plus, the kernel does this anyway.
Chih-Wei Huang [Mon, 31 Mar 2014 01:56:30 +0000 (09:56 +0800)]
let the external storages be writable
Chih-Wei Huang [Tue, 11 Feb 2014 16:41:36 +0000 (00:41 +0800)]
InputReader: add 5-point calibration
Updated for kitkat-x86.
Chih-Wei Huang [Sat, 8 Feb 2014 14:58:35 +0000 (22:58 +0800)]
add Reboot to poweroff menu
Ported from CyanogenMod.
Chih-Wei Huang [Tue, 4 Feb 2014 16:48:17 +0000 (00:48 +0800)]
skip non Android VT events
The patch is modified for KitKat from
http://git.alwaysinnovating.com/cgit.cgi/ai.android/tree/preprocess/froyo/patches/noinput.patch
Cristoforo Cataldo [Fri, 31 Jan 2014 06:36:29 +0000 (07:36 +0100)]
GlobalActions: Set the initial status of airplane mode toggle
Actually, the initial status of airplane mode toggle is set to false
when the power menu dialog is initialized.
This causes an issue if you set airplane mode and then reboot.
After the reboot, the dialog displays the wrong airplane mode status,
eg. "Airplane mode is not active", and if you toggle that option, a wrong
intent is sent again to put ON the airplane mode, instead of OFF, the
toggle (that is in transition state) will be set disabled.
This commit fixes this issue.
Change-Id: Id30355c1e090355645c437086c79ab59093c27a8
Zhenghua Wang [Thu, 14 Nov 2013 09:28:49 +0000 (17:28 +0800)]
framework: houdini hook and native activity hook rebase on KK
BZ: 150804
houdini hook and native activity hook rebase on KK
Change-Id: Ie73a6a3eeca23ffe84c328586ed2b730e44ffe02
Category: feature differentiation
Domain: AOSP.Houdini-Integration
Origin: internal
Upstream-Candidate: no,proprietary
Signed-off-by: llin4 <ling.lin@intel.com>
Signed-off-by: Zhenghua Wang <zhenghua.wang@intel.com>
jshe32X [Thu, 24 Oct 2013 04:57:09 +0000 (12:57 +0800)]
SystemUI: Recycle the old wallpaper background bitmap after we choose a new wallpaper.
BZ: 101064
RootCause: ImageWallpaper didn't call old background bitmap's recycle before
set it to null.
Category: aosp improvement
Domain: AOSP-Framework-Media
Origin: internal
Upstream-Candidate: yes
Orig-Change-Id: I27f6971a3edd26472b69e59b542b27fd7c8e7b90
Change-Id: Ice59aea79f8137d5995d7a5ce9a6ed7903750d30
Signed-off-by: jshe32X<jianchunx.shen@intel.com>
Billy [Fri, 28 Jun 2013 09:00:07 +0000 (17:00 +0800)]
Volume: Enable "Volume mute" key on HSW
Fix:
Android doesn't use master stream by default (config_useMasterVolume=false),
it cause AudioManager doesn't handle VOLUME_MUTE event. Modify AudioManager
to deal with this event, which make "Volume mute" key work.
There are 3 kind of behavior for "Volume mute" key, "Mute master stream",
"Mute activity stream" and "Mute all affected streams". Selecting the
first one as its behavior. The reasons are:
1. Mute activity stream, other streams still work. Once the activity stream
swith out, it is not easy to unmute it for user, and this behavior is different with
other desktop system usage habit, like windows.
2. For "Mute all affected streams", If the streams have different original status, some are
muted, the others are not muted, How can we define the behavior once "Volume mute" key
pressing down, mute the unmuted streams or unmute the muted streams?
Issue: AXIA-2773
Change-Id: I87179ab1ef58ca9973b6f4421039ec492fb417a7
Signed-off-by: Xiaobing Feng <xiaobing.feng@windriver.com>
juntingwang [Fri, 1 Mar 2013 08:02:56 +0000 (16:02 +0800)]
Set PS2 Keyboard controller as not a ketboard type
The Eventhub detects the platforms built-in PS/2 keyboard controller
as a physical keyboard. So the system will not display the software
keyboard by default. Modify it device type in Keyboard-less tablets,
so that ActivityManager will not ignore the PS/2 controller.
Issue: AXIA-1875
Change-Id: Ia5b7592e82aaf1970066bab5e9ca5f46ac83ab1c
Signed-off-by: juntingwang <Junting.Wang@windriver.com>
juntingwang [Wed, 24 Apr 2013 06:06:08 +0000 (14:06 +0800)]
Make "windows" key to act as "home" key
Issue: AXIA-1893
Change-Id: I7b2b19f7e34ec8a1867e8e6ce522e65133e5267f
Signed-off-by: juntingwang <Junting.Wang@windriver.com>
Andy Ross [Tue, 15 Jan 2013 23:05:38 +0000 (15:05 -0800)]
GLSurfaceView: Be less picky about EGLConfig alpha sizes
EGLChooseConfig returns a "best match" set of visuals meeting or
exceeding the required r/g/b/a component depths. But GLSurfaceView
oddly requires that the returned visual be an exact match. Add to
that that the (rarely used outside of CTS) default request specifies
zero alpha bits and that not all drivers expose a zero-alpha
EGLConfig, and the default configuration will fail needlessly.
It's not incorrect to have alpha bits you didn't request: the only way
to produce divergent behavior is for a fragment shader to write out
explicit alpha values (into the channel it didn't want to begin with!)
with values other than 1.0 and then rely on them being ignored and
treated as 1.0.
For: AXIA-1448
Change-Id: I2f64995d7b9de1ae082aa47822af525390102083
Signed-off-by: Andy Ross <andy.ross@windriver.com>
Daniel Leung [Thu, 13 Dec 2012 21:28:11 +0000 (13:28 -0800)]
Add power off button to quick settings dropdown box
Add an option to power off the device in the quick settings
drop-down dialog. It is necessary for devices which the power
button does not function as Android expected. For example,
the hardware only sends button down event but no button up
event, or there is not long press event emitted what-so-ever.
Clicking on this button asks user for confirmation, and fires
the shutdown intent.
Issue: AXIA-1271
Change-Id: I12c3af70d39d45a2974f8fca03eb332e68017e15
Original-Change-Id: Iba14b10d12e788f9df6038e20aa98384838531e0
Original-Change-Id: Ic973ebf43b79b436a9e872613b8572a7c77ce0c3
Signed-off-by: Daniel Leung <daniel.leung@intel.com>
Signed-off-by: Anton Cherkashyn <antonx.t.cherkashyn@intel.com>
Matt Gumbel [Mon, 5 Nov 2012 19:21:19 +0000 (11:21 -0800)]
ImageWallpaper: don't throw-up when EGL init fails
Just fall back to non-GL path instead.
Change-Id: Icabee5b7cadd49942e9c920a7ff49a54fc8bea9f
For: AXIA-991
Signed-off-by: Matt Gumbel <matthew.k.gumbel@linux.intel.com>
Daniel Leung [Thu, 13 Sep 2012 20:43:41 +0000 (13:43 -0700)]
Prevent EventHub from adding input device twice
When Android first starts up, it scans /dev/input for input devices.
In some rare instances, the EventHub gets another notification that
some device nodes are created. It then proceeds to add the same
input device again. This causes the system to get two events per
touch or key stroke.
This adds a check to prevent adding the same device if the operation
is triggerd by inotify.
Issue: AXIA-858
Change-Id: I68b02594f1c7f14067611735db0b3763378ec7ea
Signed-off-by: Daniel Leung <daniel.leung@intel.com>
Paul Drews [Thu, 19 Jul 2012 21:12:22 +0000 (14:12 -0700)]
Clear any stale errors before allocating layer
Symptom: On first boot, the "Make yourself at home" dialog
was not drawn, but was actually present. This prevented
swiping the home screen until you happened to click on the
invisible "OK" button or take some other action that caused
the screen to get redrawn.
Cause: GL errors remain within GL until they are cleared by
retrieving them. The createLayer function was affected by a
stale error leftover from some previous code sequence. When
it retrieved GL error status to check for success/fail of an
operation it got one of these "stale" errors and erroneously
concluded that the operation had failed.
This change clears any stale errors before embarking the
operation sequence that it wants to check for success/fail.
Issue: AXIA-425
Change-Id: I30b7fe1fbc354d3fea5e1d8cefa1be363fc68f8c
Signed-off-by: Paul Drews <paul.drews@intel.com>
Zhao Liang [Fri, 20 Jul 2012 03:56:51 +0000 (11:56 +0800)]
import YuvToEncoder R3 patches, BZ 18528, 19092, 19696
BZ: 47824
Please refer http://umgbugzilla.sh.intel.com:41006/show_bug.cgi?id=19092 and
external/jpeg/libjpeg.doc
The MCU height is max_v_samp_factor = 2 DCT rows so you must pass at least 16
scanlines on each call to jpeg_write_raw_data(), which is to say 16 actual
sample rows of Y and 8 each of Cb and Cr.
The original implement of Yuv420SpToJpegEncoder::compress didn't add padding to the frame buffer
when height and width aren't aligned with 16 pixel. It will cause illegal memory violation and core dump.
Category: aosp improvement
Domain: Video.Media-jpeg
Origin: Internal
Upstream: Yes
Change-Id: Ibcf14230d616e2d440ace244bb420723b5c01dc2
Orig-Change-Id: Ic1b7494b98ee9c1997b226d58abd034b1dcb18f6
Signed-off-by: Tong, Bo <box.tong@intel.com>
Signed-off-by: Zhao Liang <leo.zhao@intel.com>
Chih-Wei Huang [Fri, 13 Sep 2013 08:15:12 +0000 (16:15 +0800)]
MediaFile: support more media types
Chih-Wei Huang [Thu, 25 Jul 2013 20:34:26 +0000 (04:34 +0800)]
libandroid_runtime: determine whether to use OpenGL renderer at runtime
Chih-Wei Huang [Wed, 20 Feb 2013 17:46:17 +0000 (01:46 +0800)]
camera: fix NullPointerException
Chih-Wei Huang [Tue, 17 Jul 2012 08:11:07 +0000 (16:11 +0800)]
EventHub: load a default .idc if no other .idc found for touchscreen
The patch moves loadConfigurationLocked to later stage that may cause issues
if upstream changes. Needs to review it on rebasing.
Edward Peek [Tue, 3 Apr 2012 18:17:00 +0000 (06:17 +1200)]
Added option to disable touchscreen pressure sensitivity from idc files
DanielK [Tue, 20 Mar 2012 06:28:43 +0000 (14:28 +0800)]
Support old single-touch touchscreens with BTN_LEFT
Chih-Wei Huang [Thu, 8 Dec 2011 12:16:29 +0000 (20:16 +0800)]
disables hardware acceleration if debug.egl.hw=0
Chih-Wei Huang [Thu, 1 Sep 2011 06:41:36 +0000 (14:41 +0800)]
wifi: get interface name from wlan.interface
Mikhail Naganov [Wed, 7 May 2014 16:54:59 +0000 (17:54 +0100)]
Add EventLog event for logging of attempts to call java.lang.Object.getClass
Bug:
13694467
Change-Id: I886c6ffb3a008d0cf701c1adc16c607cbf7dce39
Mike Lockwood [Mon, 21 Apr 2014 15:49:30 +0000 (08:49 -0700)]
MTP: Fix getThumbnail
The thumbnail size was not being passed to the MTP stack so getThumbnail
was returning zero length data.
Bug:
13747419
Change-Id: I309d35b5c46ab5f631c0dcb5981f7896bb5a2ed5
Vinit Deshapnde [Thu, 17 Apr 2014 18:05:21 +0000 (11:05 -0700)]
Don't reset country code once it is persisted
This change simply ignores resetting of country code by cellular
networks to avoid disconnecting existing wifi connections. It also
defers setting newly found country code until after existing Wifi
connection is torn down.
Also removes some dead code related to resetting of country codes.
Bug:
13894807
Change-Id: Ie2fcfdd4b3be8ba94542772c132fb1acb6a2c683
Craig Mautner [Tue, 1 Apr 2014 19:05:11 +0000 (12:05 -0700)]
Fix FLAG_DISMISS_KEYGUARD not working
Fixes bug
13672528.
Change-Id: I0292aee51d5d8755bbae926e5f0e6af1e22107dc
Conflicts:
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
Jeff Sharkey [Fri, 28 Mar 2014 01:16:32 +0000 (18:16 -0700)]
Enlarge space allowed for internal downloads.
Bug:
13673309
Change-Id: Iefafe9abc9f116199f4a76d85bd0d7bfd872103d
Selim Cinek [Thu, 27 Mar 2014 19:27:48 +0000 (20:27 +0100)]
Fixed crash when setting wallpaper with built in rotation
If an image had a built in rotation, a crash could occur,
when setting it. An example was a panorama image which had
a rotation of 90 degrees
Change-Id: Iede8226dac3a40f08d39a69162eb388e6aba97ec
Bug:
13507421
The Android Automerger [Wed, 26 Mar 2014 00:07:08 +0000 (17:07 -0700)]
merge in klp-mr2-release history after reset to klp-dev
Eino-Ville Talvala [Tue, 25 Mar 2014 18:57:08 +0000 (18:57 +0000)]
Merge "DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values" into klp-dev
Craig Mautner [Tue, 25 Mar 2014 17:48:38 +0000 (17:48 +0000)]
am
550b44d1: am
f4644189: am
4cf6286c: am
02c7ba73: am
41bb0637: am
76e85eec: am
3bc9971d: am
95d6e32b: am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
550b44d1884c5f65187dbc8bf8d4e6090f302a7b':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Craig Mautner [Tue, 25 Mar 2014 17:42:38 +0000 (10:42 -0700)]
am
f4644189: am
4cf6286c: am
02c7ba73: am
41bb0637: am
76e85eec: am
3bc9971d: am
95d6e32b: am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
f4644189f665f221e8033587811e58f12e2ccc86':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Craig Mautner [Tue, 25 Mar 2014 17:36:04 +0000 (10:36 -0700)]
am
4cf6286c: am
02c7ba73: am
41bb0637: am
76e85eec: am
3bc9971d: am
95d6e32b: am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
4cf6286c3ccfe63bf73e6a1fb33e67d1becd16be':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Craig Mautner [Tue, 25 Mar 2014 17:29:48 +0000 (10:29 -0700)]
am
02c7ba73: am
41bb0637: am
76e85eec: am
3bc9971d: am
95d6e32b: am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
02c7ba73e8733def289535b6d13dc6a504a0443f':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Craig Mautner [Tue, 25 Mar 2014 17:22:56 +0000 (10:22 -0700)]
am
41bb0637: am
76e85eec: am
3bc9971d: am
95d6e32b: am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
41bb0637ca430808ab40a0300467ea58ae0a05c3':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Craig Mautner [Tue, 25 Mar 2014 17:22:55 +0000 (17:22 +0000)]
Merge "Don't wait for finishing animation when second display is disconnected" into klp-dev
Koji Fukui [Fri, 14 Mar 2014 12:20:21 +0000 (21:20 +0900)]
Don't wait for finishing animation when second display is disconnected
Basically WindowManagerService wait for finishing animation when
a window is removed. But when second display is disconnected, windows
on second display can't be shown even if animation is waited for.
On the contrary, it keeps on waiting for finishing the animation
in special case.
With this fix windows are immediately removed without waiting for
animation when second display is disconnected.
(Cherry picked from aosp
39f7068ed903f747d6885117dc1bac69f626ae91)
Change-Id: I1354c193c04db394a21a11c174e10c8e7da17a0e
Fixes bug: b/
13632129
Craig Mautner [Tue, 25 Mar 2014 17:04:07 +0000 (10:04 -0700)]
am
76e85eec: am
3bc9971d: am
95d6e32b: am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
76e85eec845ff3688e6fd5b7bafbb5934530df4b':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Craig Mautner [Tue, 25 Mar 2014 16:58:17 +0000 (09:58 -0700)]
am
3bc9971d: am
95d6e32b: am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
3bc9971d707839f2d26e601082d654242295002d':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Craig Mautner [Tue, 25 Mar 2014 16:52:28 +0000 (09:52 -0700)]
am
95d6e32b: am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
95d6e32bc3c5382740a6bb418f77cf7147d833f7':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Craig Mautner [Tue, 25 Mar 2014 16:48:38 +0000 (16:48 +0000)]
Merge "Move task to top in window manager." into klp-dev
Craig Mautner [Tue, 25 Mar 2014 16:48:27 +0000 (09:48 -0700)]
am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
86f9a93e20bf33b9f5152592f4781bd253be8643':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Baligh Uddin [Tue, 25 Mar 2014 16:47:23 +0000 (16:47 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Craig Mautner [Tue, 25 Mar 2014 16:43:40 +0000 (16:43 +0000)]
Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
Matthew Williams [Mon, 24 Mar 2014 21:42:06 +0000 (14:42 -0700)]
DO NOT MERGE: Downgrade expedited to normal on reschedule.
bug:
12033540
Expedited was previously tracked by a redundant internal variable, ostensibly
as an optimisation. This variable could differ from the value in the bundle
depending on how the operation is initialised, which led to confusion. Now an
expedited sync will only be treated as such on its first execution.
Change-Id: Ibfc4e9e49b86c82f2364a6ef55f887705a053eb6
Baligh Uddin [Mon, 24 Mar 2014 16:46:08 +0000 (09:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0b32878886c66eb9fdd22bf332786e140d334533
Auto-generated-cl: translation import
The Android Automerger [Mon, 24 Mar 2014 13:01:04 +0000 (06:01 -0700)]
merge in klp-mr2-release history after reset to klp-dev
Selim Cinek [Mon, 24 Mar 2014 12:53:06 +0000 (13:53 +0100)]
Fixed wallpaper bug where wrong size was taken when cropping
When cropping, the selected area of the image was incorrectly
cropped to the size of the view instead of the size of the image
Bug:
13617446
Change-Id: If54a0891fa2cdeee70ba63752874f1543d401701
Craig Mautner [Thu, 20 Mar 2014 02:48:38 +0000 (19:48 -0700)]
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Previous fix to keep non-show-when-locked windows hid dialogs from
activities that had asked to be show-when-locked. That was too
restrictive.
Fixes bug
13225149.
Change-Id: I39ae9d7cbcc9b5109257f732d027bda3a2de65e4
Gabriel Peal [Wed, 19 Mar 2014 23:41:49 +0000 (16:41 -0700)]
Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
The first set of these APIs is for telephony:
Added some APIs to ITelephony and created a first party framework for them
toggleHold()
merge()
mute(boolean mute)
playDtmfTone(char digit, boolean timedShortCode)
stopDtmfTone()
swap()
addListener(ITelephonyListener listener)
removeListener(ITelephonyListener listener)
Bug:
13302451
Change-Id: Iefec5688c26a1b4fe77f5643eba6e1690a057ee6
Igor Murashkin [Wed, 19 Mar 2014 01:14:41 +0000 (18:14 -0700)]
DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
Bug:
12609188
Change-Id: I82ea6f5de2183dd046d4bf5683600c97f37ab4da
Selim Cinek [Fri, 21 Mar 2014 18:19:08 +0000 (19:19 +0100)]
Disable Set Wallpaper button while loading image
Bug:
13534714
Change-Id: I45ff3436de40ea85fb22d776584d9f30f0795898
(cherry picked from commit
0fa6c1b146f7ed1aba335c30878e2c1b2bf2a8f1)
Chad Brubaker [Fri, 21 Mar 2014 20:52:14 +0000 (20:52 +0000)]
Merge "Fix support for simultaneous VPN tuns" into klp-dev
Chad Brubaker [Fri, 21 Mar 2014 20:52:04 +0000 (20:52 +0000)]
Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
John Reck [Fri, 21 Mar 2014 19:37:27 +0000 (19:37 +0000)]
Merge "Eliminate mHasAlpha" into klp-dev
Unsuk Jung [Fri, 21 Mar 2014 19:01:08 +0000 (19:01 +0000)]
Merge "Change wallpaper sizing" into klp-dev
John Reck [Fri, 21 Mar 2014 18:09:45 +0000 (11:09 -0700)]
Eliminate mHasAlpha
Bug:
13580771
The cached value mHasAlpha on Bitmap could get out of sync with the
real value stored in the SkBitmap. Fix this by just eliminating the
cached value. This adds an extra JNI call in copy(), createBitmap(),
and setPremultiplied(), none of which are going to be significantly
impacted by the extra JNI call.
Change-Id: I4fce069a77d9b3bbb47dde04275ff8510ce7e4f0
Jeff Sharkey [Fri, 21 Mar 2014 17:47:00 +0000 (17:47 +0000)]
Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev
Mike Lockwood [Wed, 19 Mar 2014 23:56:18 +0000 (16:56 -0700)]
Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"
This reverts commit
fbd5521fb5e94fad066e21b9f91f4782afe71660.
This change broke support for the 2011 ADK board, which never sends a "set configuration"
command before "accessory start". So we revert this change and will replace it with a better fix.
Bug:
13535051
Bug:
13393825
Change-Id: Icd870d7ff6daff1567e04d93907f70f5d7e37884
Mike Lockwood [Thu, 20 Mar 2014 18:14:08 +0000 (11:14 -0700)]
UsbDeviceManager: A better fix for race condition when starting USB accessory mode
On some devices, the USB "set configuration" command is propogated to the framework
after the "start accessory" event is received. However, on other devices like
the 2011 ADK board, no "set configuration" command is sent at all until we have
reenumerated in acccessory mode. To fix the original problem without breaking other
devices, we can simply remove assumptions about if or when "set configuration"
will be received. Now we simply remain switch USB configuration to accessory mode
when we receive the "start accessory" command, and remain there until the existing
10 second timeout expires.
Bug:
13393825
Change-Id: I4c9e3423185bd7252a907e4568d9e3ff06044b7d
Michael Jurka [Wed, 18 Dec 2013 16:10:16 +0000 (17:10 +0100)]
Change wallpaper sizing
Bug:
11997581
- ignore suggested dimensions
- when orientation changes, scale up wallpaper if
it doesn't fill the whole screen, or scale back to
original size if not necessary
Change-Id: I75b7519a105d4097bf7a35cd8af61fc40f45f8fb
(cherry picked from commit
824a4b5ea4c58592b9b2ebe787f5fb6974e7cabe)
Mike Lockwood [Fri, 21 Mar 2014 01:06:16 +0000 (01:06 +0000)]
Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev
Mike Lockwood [Fri, 21 Mar 2014 01:05:56 +0000 (01:05 +0000)]
Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev
Wei Wang [Fri, 21 Mar 2014 00:37:33 +0000 (00:37 +0000)]
Merge "Fix stopBatchedScan not working for wifi" into klp-dev
Adam Powell [Fri, 21 Mar 2014 00:19:11 +0000 (00:19 +0000)]
Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev
Wei Wang [Thu, 20 Mar 2014 23:27:01 +0000 (16:27 -0700)]
Fix stopBatchedScan not working for wifi
Change-Id: I011747da2a98cbed76a8fc6716f0c539c65f2804
Marco Nelissen [Thu, 20 Mar 2014 20:36:34 +0000 (20:36 +0000)]
am
5035faba: (-s ours) am
cecc6208: am
759445c5: resolved conflicts for merge of
c53ad4cd to jb-mr2-dev
* commit '
5035faba9a28f988291c4ff3d3cbf64d828f3f5a':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 20:22:34 +0000 (13:22 -0700)]
am
cecc6208: am
759445c5: resolved conflicts for merge of
c53ad4cd to jb-mr2-dev
* commit '
cecc62086a6ac7c17ce87d6fab1a4364b8d96cd7':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 20:16:32 +0000 (13:16 -0700)]
am
759445c5: resolved conflicts for merge of
c53ad4cd to jb-mr2-dev
* commit '
759445c5bdb2eb54af9e974f604226596976e078':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 19:51:55 +0000 (12:51 -0700)]
resolved conflicts for merge of
c53ad4cd to jb-mr2-dev
Change-Id: I5fdbc5c8c20386f173efa8957e470a644e6c14ff
Mike Lockwood [Thu, 20 Mar 2014 18:14:08 +0000 (11:14 -0700)]
UsbDeviceManager: A better fix for race condition when starting USB accessory mode
On some devices, the USB "set configuration" command is propogated to the framework
after the "start accessory" event is received. However, on other devices like
the 2011 ADK board, no "set configuration" command is sent at all until we have
reenumerated in acccessory mode. To fix the original problem without breaking other
devices, we can simply remove assumptions about if or when "set configuration"
will be received. Now we simply remain switch USB configuration to accessory mode
when we receive the "start accessory" command, and remain there until the existing
10 second timeout expires.
Bug:
13393825
Change-Id: I4c9e3423185bd7252a907e4568d9e3ff06044b7d
Mike Lockwood [Wed, 19 Mar 2014 23:56:18 +0000 (16:56 -0700)]
Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"
This reverts commit
fbd5521fb5e94fad066e21b9f91f4782afe71660.
This change broke support for the 2011 ADK board, which never sends a "set configuration"
command before "accessory start". So we revert this change and will replace it with a better fix.
Bug:
13535051
Bug:
13393825
Change-Id: Icd870d7ff6daff1567e04d93907f70f5d7e37884
Vinit Deshapnde [Thu, 20 Mar 2014 19:26:44 +0000 (19:26 +0000)]
Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev
Baligh Uddin [Thu, 20 Mar 2014 18:32:35 +0000 (18:32 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Marco Nelissen [Thu, 20 Mar 2014 18:11:16 +0000 (11:11 -0700)]
am
072e1da2: am
b17cf207: am
9ee72b65: am
665b0757: am
81fbdade: resolved conflicts for merge of
534f3e94 to jb-mr1-dev
* commit '
072e1da26e80adb4009d063428c2ef8fb65c3d6c':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 18:06:41 +0000 (11:06 -0700)]
am
b17cf207: am
9ee72b65: am
665b0757: am
81fbdade: resolved conflicts for merge of
534f3e94 to jb-mr1-dev
* commit '
b17cf207372268d91177de7efa692b2483785991':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:54:38 +0000 (10:54 -0700)]
am
9ee72b65: am
665b0757: am
81fbdade: resolved conflicts for merge of
534f3e94 to jb-mr1-dev
* commit '
9ee72b65436242ab4f8f4ceb904ea5078779416c':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:51:35 +0000 (10:51 -0700)]
am
665b0757: am
81fbdade: resolved conflicts for merge of
534f3e94 to jb-mr1-dev
* commit '
665b07579aa2a74bb5425d543892da40d78b7ef8':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:47:34 +0000 (10:47 -0700)]
am
81fbdade: resolved conflicts for merge of
534f3e94 to jb-mr1-dev
* commit '
81fbdade8db4117157ea48602be121e6cf5597dd':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:27:58 +0000 (10:27 -0700)]
resolved conflicts for merge of
534f3e94 to jb-mr1-dev
Change-Id: I48ef81bc77d5ececbe9b0cf7d5e905512ca16394
Craig Mautner [Thu, 20 Mar 2014 17:08:04 +0000 (10:08 -0700)]
Move task to top in window manager.
In certain situations it was possible for a task to move to the top
in activity manager but not in window manager. This resulted in
the task appearing behind the launcher icons.
Fixes bug
13410184.
Change-Id: If0582b395e126a8aff70a0e4c64b731083c6ae8a
Marco Nelissen [Thu, 20 Mar 2014 17:04:23 +0000 (10:04 -0700)]
am
a3337bc7: Merge "Verify certificates" into jb-dev
* commit '
a3337bc7c3a98ec12b6dec281e26c34f82025bdd':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 16:58:36 +0000 (16:58 +0000)]
Merge "Verify certificates" into jb-dev
Adam Powell [Thu, 20 Mar 2014 00:35:25 +0000 (17:35 -0700)]
Update contextual asset bar assets to avoid 9-patch artifacts
Asset drop from UX
Bug
11879853
Change-Id: I8190340900a16ae41135ec1231e36e959603e165
Wei Wang [Wed, 19 Mar 2014 22:47:12 +0000 (15:47 -0700)]
DO NOT MERGE: Move advetise clean up to callback code. fixes b/
13289050
Cherrypick from master to fix b/
13289050
Change-Id: Ibf3c772561125821817c947730cf21defafd4cb2
Wei Wang [Thu, 20 Mar 2014 03:27:46 +0000 (03:27 +0000)]
Merge "DO NOT MERGE: Add status callback for start/stop advertising." into klp-dev
Jim Miller [Tue, 10 Dec 2013 01:38:05 +0000 (17:38 -0800)]
DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService
This fixes a bug where an allocated DeathRecipient in WindowManagerService
was holding a reference to keyguard binder interface after a call to
linkToDeath() without a matchin unlinkToDeath().
It was causing the keyguard side of the binder interface to stick around,
which in tern prevented the keyguard side from releasing its references.
The solution is to ensure matching linkToDeath()/unlinkToDeath() calls.
Fixes bug
11982048
Change-Id: I6959816b819ba953512c53675162195cbf1e0653