Mady Mellor
a2e207a807
Merge "Text selection - Don't select vertical white space"
2015-03-24 20:16:29 +00:00
Adrian Roos
904a262f3d
Merge "Use Flashlight API in quick settings"
2015-03-24 19:38:02 +00:00
Mike Lockwood
c130d4d46b
Merge "MidiService: Fix some concurrency problems"
2015-03-24 19:37:04 +00:00
John Reck
2f6fb3d1b7
Merge "Shave another 10us off of hwuitask"
2015-03-24 19:35:21 +00:00
John Reck
bf29ee2a49
Shave another 10us off of hwuitask
...
pthread_cond_signal does not need the mutex
to be held to signal. This results in the thread
waking up trying to grab the lock, failing, the signaling
thread to wake up, release the lock, immediately get preempted
for the signaled thread which can now proceed.
Release the mutex before signaling to avoid the ping-pong
scheduling issue, which shaves another 10us off of this
Change-Id: Ie6bccca031ba6528f357eae8352b74626a6318c7
2015-03-24 12:31:44 -07:00
Anthony Hugh
f1bbbbfc2c
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base
2015-03-24 19:22:11 +00:00
Anthony Hugh
ea6ae3406f
am 0ab653cb: am b8f28ba0: am 457b8838: Update progress_dialog on watch to use small spinner
...
* commit '0ab653cb1d50ec4a43f3cbb8c779b5d66f0118ea':
Update progress_dialog on watch to use small spinner
2015-03-24 19:22:00 +00:00
John Reck
125104f66c
Merge "Shave 10us off of hwuitask"
2015-03-24 19:22:00 +00:00
John Reck
815f2a093a
Shave 10us off of hwuitask
...
This prevents an issue where if the signal schedules
hwuiTask it will immediately block and go back to sleep due
to mLock still being held.
This costs 10us in thread scheduling ping-ponging bouncing
between hwuiTask and RenderThread
Change-Id: I47595c1bf5736576483a6aa7aada0b1be1e04268
2015-03-24 12:16:37 -07:00
Anthony Hugh
0ab653cb1d
am b8f28ba0: am 457b8838: Update progress_dialog on watch to use small spinner
...
* commit 'b8f28ba07afcae2a3cd577d0050686da70b0611a':
Update progress_dialog on watch to use small spinner
2015-03-24 19:15:40 +00:00
Anthony Hugh
b8f28ba07a
am 457b8838: Update progress_dialog on watch to use small spinner
...
* commit '457b8838cb7b9383bbad832ed35e8a58c7b6051b':
Update progress_dialog on watch to use small spinner
2015-03-24 19:09:13 +00:00
Wale Ogunwale
e7f931c450
Merge "Fixed build breakage caused by AOSP submission http://go/oag/c/143360 "
2015-03-24 17:50:26 +00:00
Christopher Tate
00182096d8
Merge "Switch to new userActivity and package install APIs"
2015-03-24 17:43:59 +00:00
Wale Ogunwale
0ade61bc97
Fixed build breakage caused by AOSP submission http://go/oag/c/143360
...
Change-Id: I64288bd49e6713ab40b52735802210abc91348a7
2015-03-24 10:43:45 -07:00
Christopher Tate
2c7a0cc2cf
Switch to new userActivity and package install APIs
...
Tracking the deprecation of older API variants and switching to the
new and more informative versions. Also tidying up a few unused
variables along the way.
Change-Id: I282a18525f9db838f4e0a77c90403b8b904e4fd7
2015-03-24 10:41:52 -07:00
Svetoslav
9041df7f69
Remove obsolete comments
...
Change-Id: Ieabe9e8e86cfe226751a0402e4c7d55f2a18c8b1
2015-03-24 10:03:08 -07:00
Olawale Ogunwale
0dbc50acae
am 04466d92: am bfd7a123: am f5f70b66: Merge "[ActivityManager] Avoid killing unrelated processes."
...
* commit '04466d92db4b4a511141d272db045864950b4d7d':
[ActivityManager] Avoid killing unrelated processes.
2015-03-24 16:38:43 +00:00
Olawale Ogunwale
a2e8de7410
am 357d4ec8: am 3e305491: am 000293c9: Merge "Layout the window to be displayed if it would be resized"
...
* commit '357d4ec8b75dc53371c8eb39663720db6c63a6e9':
Layout the window to be displayed if it would be resized
2015-03-24 16:38:35 +00:00
Olawale Ogunwale
a44c1bbf72
am 4f8783de: am fecfadb5: am 07520c94: Merge "DimLayer : remove unnecessary surface transaction calls"
...
* commit '4f8783de72633188e4a52ffdf79e5b8f91282974':
DimLayer : remove unnecessary surface transaction calls
2015-03-24 16:38:28 +00:00
Olawale Ogunwale
04466d92db
am bfd7a123: am f5f70b66: Merge "[ActivityManager] Avoid killing unrelated processes."
...
* commit 'bfd7a1233411c60692797f9824695b90663061bf':
[ActivityManager] Avoid killing unrelated processes.
2015-03-24 16:31:47 +00:00
Olawale Ogunwale
357d4ec8b7
am 3e305491: am 000293c9: Merge "Layout the window to be displayed if it would be resized"
...
* commit '3e305491cc24669305e22875c1fea337faed0b2c':
Layout the window to be displayed if it would be resized
2015-03-24 16:31:43 +00:00
Olawale Ogunwale
4f8783de72
am fecfadb5: am 07520c94: Merge "DimLayer : remove unnecessary surface transaction calls"
...
* commit 'fecfadb5084d89d987e4b4f0793feb8c18897a3d':
DimLayer : remove unnecessary surface transaction calls
2015-03-24 16:31:39 +00:00
Andreas Gampe
84d9e0ef0b
am 5e968ad1: am dde72862: am 7db6ebe0: Merge "Frameworks/base: Don\'t allocate another identity matrix"
...
* commit '5e968ad1d6c0387fb6b71b3693f5c0e95ccf469f':
Frameworks/base: Don't allocate another identity matrix
2015-03-24 16:28:23 +00:00
Olawale Ogunwale
bfd7a12334
am f5f70b66: Merge "[ActivityManager] Avoid killing unrelated processes."
...
* commit 'f5f70b66a3f22ca5e23a4d1e6061f2a36dfb4c92':
[ActivityManager] Avoid killing unrelated processes.
2015-03-24 16:25:11 +00:00
Olawale Ogunwale
3e305491cc
am 000293c9: Merge "Layout the window to be displayed if it would be resized"
...
* commit '000293c93b41f69857f228d085b6f44b9afa34b0':
Layout the window to be displayed if it would be resized
2015-03-24 16:25:03 +00:00
Olawale Ogunwale
fecfadb508
am 07520c94: Merge "DimLayer : remove unnecessary surface transaction calls"
...
* commit '07520c944cfce3441621c6d08ca185d0efb3ea50':
DimLayer : remove unnecessary surface transaction calls
2015-03-24 16:24:55 +00:00
Andreas Gampe
5e968ad1d6
am dde72862: am 7db6ebe0: Merge "Frameworks/base: Don\'t allocate another identity matrix"
...
* commit 'dde7286273d2afd09752123be06312d1629fd6f1':
Frameworks/base: Don't allocate another identity matrix
2015-03-24 16:22:03 +00:00
Skuhne
dddea39df0
Merge "Adding menu to arrange one or two tasks and arrange them accordingly"
2015-03-24 16:21:49 +00:00
Skuhne
8aa7d161a1
Adding menu to arrange one or two tasks and arrange them accordingly
...
Added dialog with buttons for task arrangement upon click on decorator
icon.
BUG: 19492945,19868830,19656507
Change-Id: Ie31e2788efb097db1c1f54f0ef1b2fda1ccc71ec
2015-03-24 09:20:51 -07:00
Andreas Gampe
dde7286273
am 7db6ebe0: Merge "Frameworks/base: Don\'t allocate another identity matrix"
...
* commit '7db6ebe03719dfc6b9fb680b038fd9ef0302e4ca':
Frameworks/base: Don't allocate another identity matrix
2015-03-24 16:14:33 +00:00
Olawale Ogunwale
f5f70b66a3
Merge "[ActivityManager] Avoid killing unrelated processes."
2015-03-24 16:12:23 +00:00
Olawale Ogunwale
000293c93b
Merge "Layout the window to be displayed if it would be resized"
2015-03-24 16:11:40 +00:00
Olawale Ogunwale
07520c944c
Merge "DimLayer : remove unnecessary surface transaction calls"
2015-03-24 16:10:49 +00:00
Andreas Gampe
7db6ebe037
Merge "Frameworks/base: Don't allocate another identity matrix"
2015-03-24 16:02:55 +00:00
John Reck
111928fa32
resolved conflicts for merge of 4142f026 to master
...
Change-Id: Iabe3aa0ac6911a26d2ba7219f18332897276ed6f
2015-03-24 08:34:23 -07:00
John Reck
4142f026b3
am 05bb06fd: am 540e1f8c: Merge "Don\'t create unnecessary RenderThread\'s instance when executing \'dumpsys gfxinfo\'"
...
* commit '05bb06fd499efcb6880359059324578b5a09e5f6':
Don't create unnecessary RenderThread's instance when executing 'dumpsys gfxinfo'
2015-03-24 15:02:10 +00:00
John Reck
05bb06fd49
am 540e1f8c: Merge "Don\'t create unnecessary RenderThread\'s instance when executing \'dumpsys gfxinfo\'"
...
* commit '540e1f8cbcbc255ca57fba81befd4d6346178cec':
Don't create unnecessary RenderThread's instance when executing 'dumpsys gfxinfo'
2015-03-24 14:55:54 +00:00
John Reck
540e1f8cbc
Merge "Don't create unnecessary RenderThread's instance when executing 'dumpsys gfxinfo'"
2015-03-24 14:44:06 +00:00
Craig Lafayette
1cef419688
Merge "Add Bluetooth connection extras to DPM."
2015-03-24 12:19:35 +00:00
Craig Lafayette
97e473e1e1
Add Bluetooth connection extras to DPM.
...
These extras will be used in ManagedProvisioning to allow
Bluetooth connections from provisioned devices.
Change-Id: I7118acd4ea71e2028a0c9f0c61031c78deef8908
2015-03-24 07:03:23 -04:00
Dohyun Lee
6ce3a37f6b
DimLayer : remove unnecessary surface transaction calls
...
There is the case that adjustSurface() get called even if
the size of the surface of DimLayer is not changed actually.
Since changing the size of a surface is processed synchronously
in the SurfacFlinger, there is usually a few milliseconds delay
(up to 1 vsync interval) when we launch an application.
This patch avoids such cases.
Change-Id: Ib1f76d54f9f2364ac54b70120e4b781e8534e750
Signed-off-by: Dohyun Lee <dohyun.lee@lge.com>
2015-03-24 13:31:22 +09:00
Dongwon Kang
a7b212d9f1
Merge "TIF: Add COLUMN_INTERNAL_PROVIDER_FLAGX to TvContract.Programs"
2015-03-24 04:07:25 +00:00
Qiwen Zhao
44f388a3ed
Merge commit 'ff4bdd0b'
2015-03-23 20:18:22 -07:00
Miao Wang
ab452f70fc
am 2b30b73b: am 6f6f44b0: am b2b0c4c2: Merge "[RenderScript] Add create(Context, int) to be compatible with the thunker layer & minor tweaks."
...
* commit '2b30b73b017f10bc2ce514981b577c2efaeab739':
[RenderScript] Add create(Context, int) to be compatible with the thunker layer & minor tweaks.
2015-03-24 02:59:12 +00:00
Anthony Hugh
568e391872
am c8bb597f: (-s ours) am 09ebc52a: am 7c08dd61: Merge "DO NOT MERGE: Set the appliance (tv/watch) in the configuration earlier" into lmp-mr1-modular-dev
...
* commit 'c8bb597fba16589b9d76959bae22da22d00967d4':
DO NOT MERGE: Set the appliance (tv/watch) in the configuration earlier
2015-03-24 02:58:56 +00:00
Filip Gruszczynski
90214cd7f5
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base
2015-03-24 02:58:54 +00:00
Dmitriy Ivanov
6a225edccd
Merge "Load libraries directly from apk"
2015-03-24 02:57:10 +00:00
Michael Wright
d99c5f6fb6
am 72261270: am b42baaa8: am 978cfc39: Merge "SystemUI needs the SET_WALLPAPER permission"
...
* commit '722612707e7eef745dab573ff226e2bd904295cb':
SystemUI needs the SET_WALLPAPER permission
2015-03-24 02:56:08 +00:00
Jeff Sharkey
bafd48d027
Merge "Introduce per-user GIDs for storage."
2015-03-24 02:38:48 +00:00
Craig Mautner
6a1cbb106a
Merge "Prevent unexpected rotation while going back to keyguard"
2015-03-24 02:24:59 +00:00