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

16013 Commits

Author SHA1 Message Date
Daniel Cashman
0d30e07d23 am 3d5ea26f: am 4503409a: Merge "Clear cached locations when location providers disabled Bug: 12118307" into klp-dev 
* commit '3d5ea26fbb92b1b780cd9763c0731288f48341a3':
  Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 10:52:54 -08:00
Jeff Sharkey
4bc9432f28 am 38c65b1f: am 6fba240b: am 6d3700b3: am 47235e8b: am 90cadb35: Merge "MountService listeners can not be unregistered" 
* commit '38c65b1f70042bc8e37e91106692158f0ce98703':
  MountService listeners can not be unregistered
 2014-01-13 18:51:24 +00:00
Jeff Sharkey
38c65b1f70 am 6fba240b: am 6d3700b3: am 47235e8b: am 90cadb35: Merge "MountService listeners can not be unregistered" 
* commit '6fba240b72e9ae2bc66c98b058e78aecd568ae3f':
  MountService listeners can not be unregistered
 2014-01-13 18:47:41 +00:00
Jeff Sharkey
6fba240b72 am 6d3700b3: am 47235e8b: am 90cadb35: Merge "MountService listeners can not be unregistered" 
* commit '6d3700b394c7137ef95580d35223a402a3dd0e7c':
  MountService listeners can not be unregistered
 2014-01-13 18:44:43 +00:00
Jeff Sharkey
6d3700b394 am 47235e8b: am 90cadb35: Merge "MountService listeners can not be unregistered" 
* commit '47235e8b5ce6c622a1182933404cf5a17fcd35dc':
  MountService listeners can not be unregistered
 2014-01-13 10:42:07 -08:00
Jeff Sharkey
90cadb3515 Merge "MountService listeners can not be unregistered" 2014-01-13 18:35:32 +00:00
Henrik Baard
9bd36ef2f7 Structure device not freed in error case 
In case of an error in the call usb_device_get_fd()
the memory created by usb_open_device() is never
freed.

Added a call to usb_device_close in case of error to
release the allocated memory.

Change-Id: Iaa83674f000242d80604dd30c782236f7afd90c2
 2014-01-13 18:06:05 +01:00
Craig Mautner
80a6e776e0 am cf6e0d68: Merge "Add display synchronously." into klp-modular-dev 
* commit 'cf6e0d686f42036992bdac4f47d37bc8c0775027':
  Add display synchronously.
 2014-01-13 05:44:18 +00:00
Craig Mautner
cf6e0d686f Merge "Add display synchronously." into klp-modular-dev 2014-01-13 05:33:51 +00:00
Craig Mautner
ad25fa36cb Add display synchronously. 
Adding the virtual display to window manager through a handler message
causes timing issues. Add the display directly to fix it.

Change-Id: I3ad6b16ce6dff2a48abd120a8e873e11a028e2c3
 2014-01-12 21:26:09 -08:00
Craig Mautner
663fb7a09e am da9b87a7: am 5d8936b4: am 27581792: am 54f99137: am 3747768b: Merge "Fix visibility of multiple non-fullscreen activities." 
* commit 'da9b87a70994ed00868dd4405243932fe7e267f2':
  Fix visibility of multiple non-fullscreen activities.
 2014-01-11 00:12:50 +00:00
Craig Mautner
da9b87a709 am 5d8936b4: am 27581792: am 54f99137: am 3747768b: Merge "Fix visibility of multiple non-fullscreen activities." 
* commit '5d8936b4cfdb14941536e533c2cc376e99b9f7d5':
  Fix visibility of multiple non-fullscreen activities.
 2014-01-11 00:09:22 +00:00
Craig Mautner
5d8936b4cf am 27581792: am 54f99137: am 3747768b: Merge "Fix visibility of multiple non-fullscreen activities." 
* commit '275817929a584b220a54b5c8206c7a7425da16d4':
  Fix visibility of multiple non-fullscreen activities.
 2014-01-11 00:05:55 +00:00
Craig Mautner
275817929a am 54f99137: am 3747768b: Merge "Fix visibility of multiple non-fullscreen activities." 
* commit '54f991375a9c7c2a256e6aec7d4a223be8d36b39':
  Fix visibility of multiple non-fullscreen activities.
 2014-01-10 16:03:06 -08:00
Craig Mautner
7ef6c04afd am d7c97a79: Merge "Remove misleading warnings." into klp-modular-dev 
* commit 'd7c97a798f25d54a00adc0cfb2af4dedd5a4e3f2':
  Remove misleading warnings.
 2014-01-10 23:10:20 +00:00
Craig Mautner
d7c97a798f Merge "Remove misleading warnings." into klp-modular-dev 2014-01-10 23:06:50 +00:00
Craig Mautner
330a6bd8a6 Remove misleading warnings. 
Error messages that are obsolete and/or incorrect.

Fixes bug 12421138.

Change-Id: I43f095048757f7ae9bff47abed594dd34d8387ce
 2014-01-10 15:05:29 -08:00
Craig Mautner
d4abbb964b am 93884a5b: Fix invalid stackId bug. 
* commit '93884a5b35ec97a0f44795950363188d9a21137a':
  Fix invalid stackId bug.
 2014-01-10 21:32:21 +00:00
Craig Mautner
93884a5b35 Fix invalid stackId bug. 
Eliminate race condition by executing window manager createStack
directly from activity manager.

Change-Id: I2dda276d07d0ae09c7c958980bc5ebffe72ebd92
 2014-01-10 13:28:10 -08:00
Craig Mautner
1f7488e219 resolved conflicts for merge of 4504de5d to master 
Change-Id: I8d96fd2b479aebd6de913e617ca190f66c25aaa5
 2014-01-10 11:15:19 -08:00
Craig Mautner
4504de5d5a Implement ActivityView. 
With an existing ActivityContainer a caller can now create an
ActivityView which consists of a new VirtualDisplay immediately
attached to the ActivityContainer.

Change-Id: Id70333dcbef55d524a87df8f8c92d72ca5579364
 2014-01-10 10:54:55 -08:00
Craig Mautner
88a00abe08 am 0bb2a4de: Merge "Call moveHomeStack before moving any stack." into klp-modular-dev 
* commit '0bb2a4deee6451a2f3075254761e9bfb38429fa4':
  Call moveHomeStack before moving any stack.
 2014-01-10 16:46:43 +00:00
Craig Mautner
0bb2a4deee Merge "Call moveHomeStack before moving any stack." into klp-modular-dev 2014-01-10 16:43:19 +00:00
Craig Mautner
fefeef8249 Call moveHomeStack before moving any stack. 
Order matters, otherwise mFocusedStack and mLastStack aren't updated
correctly.

Fixes bug 12478856.

Change-Id: I12e4334678bb3af49d1ff26c4003def3e8d987c2
 2014-01-10 08:40:23 -08:00
Antonio Marín Cerezuela
c5ac15a3e1 Telephony API extension v2 
Added new AndroidManifest permission:

android.permission.READ_PRECISE_PHONE_STATE

Added the following PhoneStateListeners and corresponding broadcast intents:

onPreciseCallStateChanged(PreciseCallState callState);
onPreciseDataConnectionStateChanged(PreciseDataConnectionState dataConnectionState);

broadcastPreciseCallStateChanged(int ringingCallState, int foregroundCallState, int backgroundCallState,
	int disconnectCause, int preciseDisconnectCause)
broadcastPreciseDataConnectionStateChanged(int state, int networkType, String apnType, String apn,
	String reason, LinkProperties linkProperties, String failCause)

Added TelephonyManager intent actions with their extras and constants:

public static final String ACTION_PRECISE_CALL_STATE_CHANGED = "android.intent.action.PRECISE_CALL_STATE";
public static final String ACTION_PRECISE_DATA_CONNECTION_STATE_CHANGED = "android.intent.action.PRECISE_DATA_CONNECTION_STATE_CHANGED";

public static final int PRECISE_CALL_STATE_*

Moved public static final int DISCONNECT_CAUSE_* from PreciseCallState.java to a new class DisconnectCause.java

Moved public static final int PRECISE_DISCONNECT_CAUSE_* from PreciseCallState.java to a new class PreciseDisconnectCause.java

Change-Id: If3b88c679507c529b746046c4a17cf6d9974bd09
 2014-01-10 11:08:06 +01:00
Amith Yamasani
a3040e8d5d am 22eba28e: Only compile the services jar and so when using mmm 
* commit '22eba28e90e58230cc120bd53faaf223651f9344':
  Only compile the services jar and so when using mmm
 2014-01-10 00:23:21 +00:00
Amith Yamasani
22eba28e90 Only compile the services jar and so when using mmm 
Don't build the tests when using "mmm frameworks/base/services"

Change-Id: If1895598381bd0fce0b4d7f5e879f154d8fc44d0
 2014-01-09 15:38:12 -08:00
Ying Wang
ba09ada20e Include subdirectory Android.mks. 
Change-Id: I6e6bc721dbcf127b52f2a60f255c9fc677d3be29
(cherry picked from commit c459bfea7e7be4343387dee137d4a5be9742fd91)
 2014-01-09 20:41:57 +00:00
Ying Wang
ddf89c0cc8 Merge "Include subdirectory Android.mks." 2014-01-09 20:21:14 +00:00
Ying Wang
c459bfea7e Include subdirectory Android.mks. 
Change-Id: I6e6bc721dbcf127b52f2a60f255c9fc677d3be29
 2014-01-09 11:02:03 -08:00
riddle_hsu
446ef1de8d 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
 2014-01-09 20:24:34 +08:00
Jeff Brown
7fa44e90ed am b6d9eb87: Merge "Add flag to force public virtual display to show own content." into klp-modular-dev 
* commit 'b6d9eb875a0bf1bb655a90c88457689342eb0991':
  Add flag to force public virtual display to show own content.
 2014-01-09 02:14:56 +00:00
Jeff Brown
b6d9eb875a Merge "Add flag to force public virtual display to show own content." into klp-modular-dev 2014-01-09 02:12:59 +00:00
Vinit Deshpande
80a3a364fd Merge "Revert "Revert "Move Wifi services to a new git project""" 2014-01-08 23:47:44 +00:00
RoboErik
2dfae9bea1 Merge "b/12068020 Make kb layouts only unique to vendor/product" 2014-01-08 22:07:14 +00:00
Craig Mautner
b859449b71 resolved conflicts for merge of 88bfc6dd to master 
Change-Id: Ib656ac0591b21ad14f2df51021729552e9373515
 2014-01-08 09:51:33 -08:00
Craig Mautner
88bfc6ddc8 Merge "Extend stack management to other displays." into klp-modular-dev 2014-01-08 17:33:42 +00:00
Mike Lockwood
7b925fbb87 am 43bc1c07: am d9e708e3: am 12ec2e6d: am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters" 
* commit '43bc1c07d25b7f278a860bbb9118f46ac732593a':
  Added missing USB device descriptor fields needed for intent filters
 2014-01-08 16:10:42 +00:00
Mike Lockwood
43bc1c07d2 am d9e708e3: am 12ec2e6d: am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters" 
* commit 'd9e708e365d94e83ec135f1486129febd3f8eaea':
  Added missing USB device descriptor fields needed for intent filters
 2014-01-08 16:08:17 +00:00
Mike Lockwood
d9e708e365 am 12ec2e6d: am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters" 
* commit '12ec2e6d71bc69ca11946f7f051931863c934273':
  Added missing USB device descriptor fields needed for intent filters
 2014-01-08 16:05:29 +00:00
Mike Lockwood
12ec2e6d71 am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters" 
* commit '992065938a95e5273b22dea009b8581bcc693e61':
  Added missing USB device descriptor fields needed for intent filters
 2014-01-08 08:01:42 -08:00
Mike Lockwood
9607d78f51 Merge "Added missing USB device descriptor fields needed for intent filters" 2014-01-08 15:56:13 +00:00
Narayan Kamath
bcf40bcda5 am e853de1f: am 2d87407e: am 136c0219: am c156021d: am 8a927cfa: Merge "Fix a bug introduced in change 73712" 
* commit 'e853de1f10820da1bc7b6bf13faadaf835239c29':
  Fix a bug introduced in change 73712
 2014-01-08 13:09:05 +00:00
Narayan Kamath
e853de1f10 am 2d87407e: am 136c0219: am c156021d: am 8a927cfa: Merge "Fix a bug introduced in change 73712" 
* commit '2d87407e5765228a3469b9681ebff6c0c7eee140':
  Fix a bug introduced in change 73712
 2014-01-08 13:06:55 +00:00
Narayan Kamath
2d87407e57 am 136c0219: am c156021d: am 8a927cfa: Merge "Fix a bug introduced in change 73712" 
* commit '136c02191790aa937c490341df49e966735f6857':
  Fix a bug introduced in change 73712
 2014-01-08 13:04:15 +00:00
Narayan Kamath
136c021917 am c156021d: am 8a927cfa: Merge "Fix a bug introduced in change 73712" 
* commit 'c156021debb8e13324e451cb288da7edd7e112ca':
  Fix a bug introduced in change 73712
 2014-01-08 05:00:33 -08:00
Narayan Kamath
2c0971eeec am 3f7b8d0c: resolved conflicts for merge of 92ae0347 to klp-modular-dev 
* commit '3f7b8d0c6c2b1b6a8d183769621f5fd9c36cfc85':
  AArch64: Use long for pointers in services
 2014-01-08 12:34:29 +00:00
Narayan Kamath
87d6cd4537 Fix a bug introduced in change 73712 
"return (bool) true" was incorrectly changed to
"return (jboolean) JNI_FALSE"

Change-Id: I45f62f60c5affbae7970bb8889c55981e26d01ba
 2014-01-08 12:26:28 +00:00
Narayan Kamath
3f7b8d0c6c resolved conflicts for merge of 92ae0347 to klp-modular-dev 
Change-Id: I703aea4f20985a4bbda0f685254721d6480bb20f
 2014-01-08 12:19:40 +00:00
Narayan Kamath
92ae034756 am cbf339f6: am ab169215: am f210044f: Merge "AArch64: Use long for pointers in services" 
* commit 'cbf339f6e4bf45a7d41cd0327d2dd7975875b8aa':
  AArch64: Use long for pointers in services
 2014-01-08 12:01:04 +00:00