drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
185,806 Commits 1 Branch 0 Tags
Commit Graph

185806 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jeff Sharkey
00f3904629 Introduce per-user GIDs for storage. 
This will eventually allow us to have a single unified filesystem
instead of requiring zygote to use bind mounts.

Change-Id: I29b819ab51498b4bab874e0367b1ab4165f84025
 2015-03-23 19:14:19 -07:00
Svet Ganov
95c1adea0c Add install option to grant all runtime permissions. 
Change-Id: I72ba67a72025646a3d53611621b0353d3a86677c
 2015-03-24 01:53:50 +00:00
Svetoslav
ca7256ef32 Merge "Runtime permissions: per user permission tracking." 2015-03-24 01:52:11 +00:00
Svetoslav
c6d1c345f4 Runtime permissions: per user permission tracking. 
Before all permissions were granted at install time at once, so the user
was persented with an all or nothing choice. In the new runtime permissions
model all dangarous permissions (nomal are always granted and signature
one are granted if signatures match) are not granted at install time and
the app can request them as necessary at runtime.

Before, all granted permission to an app were identical for all users as
granting is performed at install time. However, the new runtime model
allows the same app running under two different users to have different
runtime permission grants. This change refactors the permissions book
keeping in the package manager to enable per user permission tracking.

The change also adds the app facing APIs for requesting runtime permissions.

Change-Id: Icbf2fc2ced15c42ca206c335996206bd1a4a4be5
 2015-03-23 18:50:35 -07:00
Geoff Mendal
27f285bf9e am abdbf186: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'abdbf1860c7855687aacbb4e293a6e6ec40c0213':
  Import translations. DO NOT MERGE
 2015-03-24 01:34:14 +00:00
Geoff Mendal
c1885e82b6 am 4d17b954: (-s ours) am 2f12b803: (-s ours) am eded9424: (-s ours) Import translations. DO NOT MERGE 
* commit '4d17b9549e0223b1efb2b66cf71e36b7a56420ee':
  Import translations. DO NOT MERGE
 2015-03-24 01:33:04 +00:00
Christopher Tate
c75517c160 Merge "Back up and restore the set of enabled IMEs" 2015-03-24 01:13:20 +00:00
Griff Hazen
9018354a67 Merge "Merge commit '583c7c56' into master" 2015-03-24 01:12:26 +00:00
Jeff Tinker
3910eb551c Merge "Note in docs that MediaDrm methods throw IllegalStateException" 2015-03-24 00:10:21 +00:00
Jeff Tinker
8873f848aa Merge "Report key request message type for unprefixed EME" 2015-03-24 00:05:34 +00:00
Dianne Hackborn
312035232b Merge "Add view ID, rework assist API." 2015-03-24 00:02:38 +00:00
Craig Mautner
93f724b04e Merge "Recalculate input method top edge." 2015-03-23 23:56:42 +00:00
Griff Hazen
daf5c0ebd0 Merge commit '583c7c56' into master 
Change-Id: I89c2c63005fbb6b1c058b2022f4469be5244505f
 2015-03-23 16:34:11 -07:00
tiger_huang
21637018f9 Prevent unexpected rotation while going back to keyguard 
The original logic would let the app hidden by keyguard be able to
decide the orientation. While going back from a show-when-locked app
to keyguard, there would be a short time that keyguard is unable to
decide the orientation, which causes WMS uses the wrong orientation
from the wrong app.

https://code.google.com/p/android/issues/detail?id=155640

Change-Id: Ibc17bfe4603f68b241dc7380459ec9de42a3e259
 2015-03-23 16:28:53 -07:00
Christopher Tate
7b9a28c7f0 Back up and restore the set of enabled IMEs 
The restored set of enabled IMEs/subtypes is merged into the
current state of the system, rather than simply replacing it.
This is because we do not want to accidentally disable or
reconfigure something that the user is currently relying on.

There's a certain amount of repetitive activity here, rebuilding
the enabled-state data structures in a different format, but it's
important for maintainability that the restore code be able to
rely on the core InputMethodUtils implementation of reading/writing
the settings element.

Bug 19822542

Change-Id: If0104151b3526da6ecc669adde3119a239ecafeb
 2015-03-23 16:28:21 -07:00