Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
115,646 Commits 3 Branches 0 Tags
28cf65a6cf191da2bae765c15080b91f1909c2d2
Commit Graph

12661 Commits

Author SHA1 Message Date
Vinit Deshapnde
28cf65a6cf am adcf8696: am b1992b55: am e42325c7: Merge "Fix incorrect VPN time" into klp-dev 
* commit 'adcf86961356157089daa4dc13c865258d1eea49':
  Fix incorrect VPN time
 2013-10-02 12:32:42 -07:00
Vinit Deshapnde
adcf869613 am b1992b55: am e42325c7: Merge "Fix incorrect VPN time" into klp-dev 
* commit 'b1992b55e967329f3bc9a63229615130761df701':
  Fix incorrect VPN time
 2013-10-02 12:29:26 -07:00
Vinit Deshapnde
e42325c765 Merge "Fix incorrect VPN time" into klp-dev 2013-10-02 19:23:23 +00:00
Vinit Deshapnde
2b862e5e75 Fix incorrect VPN time 
First, startTime's default value is -1 and not 0, so use it to test
if the startTime is set. Also, startTime isn't being set when connecting
legacy VPN; this change fixes that too.


Bug: 10985174
Change-Id: Ibf52b8f489b18c96efba501b76aa73e9a9e0e3e8
 2013-10-02 11:50:39 -07:00
Craig Mautner
e8a7bcde58 am 638ead32: am 76027655: am 93cb8f6b: Merge "Create new window-side task on demand." into klp-dev 
* commit '638ead32b901a7f40ae532e50a483d87364806ef':
  Create new window-side task on demand.
 2013-10-02 10:55:56 -07:00
Craig Mautner
638ead32b9 am 76027655: am 93cb8f6b: Merge "Create new window-side task on demand." into klp-dev 
* commit '76027655fba1e3a3d548380767a7a8989a2cfc3d':
  Create new window-side task on demand.
 2013-10-02 10:52:48 -07:00
Craig Mautner
93cb8f6b78 Merge "Create new window-side task on demand." into klp-dev 2013-10-02 17:45:47 +00:00
Craig Mautner
31482a7fe1 Create new window-side task on demand. 
The activity manager can create a new task under certain
circumstances in resetTargetTaskIfNeededLocked(). In that case the
window manager was not told to create a new task. This fix creates the
task in window manager when it recognizes that there is a new task
required.

Fixes bug 10412588.

Change-Id: Ife9ecfeb7f53f9df5950322c9359c836adc258a2
 2013-10-02 10:35:17 -07:00
Craig Mautner
7f3a3c26af am 8c3e643d: am 611fb917: am 09be37b2: Merge "Add debuggging for 10858941." into klp-dev 
* commit '8c3e643dc47d1c637cb5ba545ccf71afcb083cc5':
  Add debuggging for 10858941.
 2013-10-02 09:44:34 -07:00
Dianne Hackborn
5d93ad94a3 am 1d536848: am 239dc099: am 164371fb: Fix issue #11005453: [SUW] G+ profile creation for new user broken 
* commit '1d536848af1531dd14af52000f5ab505162bf123':
  Fix issue #11005453: [SUW] G+ profile creation for new user broken
 2013-10-02 09:44:30 -07:00
Adam Lesinski
49e43291b2 am 234c6c8a: am ff7cba54: am 42e9b631: Merge "Make room for new public flags" into klp-dev 
* commit '234c6c8aafa4abc440d5bf38aac058b96ba1434c':
  Make room for new public flags
 2013-10-02 09:44:23 -07:00
Jeff Brown
5d5e5733f9 am 0f7f648f: am 9601b51c: am 42544cf8: Merge "Track wireless charger detector timeout explicitly." into klp-dev 
* commit '0f7f648f1af70bdc69ac93d1af12aefcdda0523d':
  Track wireless charger detector timeout explicitly.
 2013-10-02 09:44:19 -07:00
Amith Yamasani
15ef4b4127 am a48f2419: am 0ba4a29c: am 86519dd5: Merge "Use correct method for sparsearray lookup" into klp-dev 
* commit 'a48f2419cecf571bbe6500b9e1d7b03c297e9c7c':
  Use correct method for sparsearray lookup
 2013-10-02 09:44:07 -07:00
Craig Mautner
473402a792 am 9814cf73: am 0e1daee3: am 66de7f4f: Merge "Fixes to handleAppDiedLocked." into klp-dev 
* commit '9814cf73d4f73a4e6d8eebe2d828d24800184737':
  Fixes to handleAppDiedLocked.
 2013-10-02 09:43:51 -07:00
Svetoslav Ganov
b3100e4e3d am bf4e8472: am fddc4bfe: am b1cd745f: Merge "Fail print jobs targeted to unavailable services." into klp-dev 
* commit 'bf4e84724fbfaff8f2876af04e16f7047812f858':
  Fail print jobs targeted to unavailable services.
 2013-10-02 09:43:47 -07:00
Craig Mautner
61f5d97984 am c5495c93: am eba784f0: am 3c98926b: Merge "Add a timeout for removing starting windows." into klp-dev 
* commit 'c5495c93e51ba6493a6b99aaabd44abc9d25cd1e':
  Add a timeout for removing starting windows.
 2013-10-02 09:43:32 -07:00
Jeff Sharkey
b6ab3b982b am 7f60e70e: am 666b998b: am 364fc14f: Merge "Detect wedged ContentProviders, treat as ANR." into klp-dev 
* commit '7f60e70e815d381035b141843395830407c198d9':
  Detect wedged ContentProviders, treat as ANR.
 2013-10-02 09:43:21 -07:00
Craig Mautner
8c3e643dc4 am 611fb917: am 09be37b2: Merge "Add debuggging for 10858941." into klp-dev 
* commit '611fb91723718526a9d20fce92135b2e32fc3a8b':
  Add debuggging for 10858941.
 2013-10-02 09:37:29 -07:00
Dianne Hackborn
1d536848af am 239dc099: am 164371fb: Fix issue #11005453: [SUW] G+ profile creation for new user broken 
* commit '239dc099a0d56eba3c7a537df23ef3c5046b2667':
  Fix issue #11005453: [SUW] G+ profile creation for new user broken
 2013-10-02 09:37:26 -07:00
Adam Lesinski
234c6c8aaf am ff7cba54: am 42e9b631: Merge "Make room for new public flags" into klp-dev 
* commit 'ff7cba54fc87509c94567d19c672693329868f7e':
  Make room for new public flags
 2013-10-02 09:37:13 -07:00
Jeff Brown
0f7f648f1a am 9601b51c: am 42544cf8: Merge "Track wireless charger detector timeout explicitly." into klp-dev 
* commit '9601b51cd96b99ff7e016e09f3c25d3b59f56602':
  Track wireless charger detector timeout explicitly.
 2013-10-02 09:37:10 -07:00
Amith Yamasani
a48f2419ce am 0ba4a29c: am 86519dd5: Merge "Use correct method for sparsearray lookup" into klp-dev 
* commit '0ba4a29c97a8835bdff589c4187ac69d136f0a6a':
  Use correct method for sparsearray lookup
 2013-10-02 09:36:45 -07:00
Craig Mautner
9814cf73d4 am 0e1daee3: am 66de7f4f: Merge "Fixes to handleAppDiedLocked." into klp-dev 
* commit '0e1daee3a60dd6e36e4fa26eb35b31423f4f7547':
  Fixes to handleAppDiedLocked.
 2013-10-02 09:36:19 -07:00
Svetoslav Ganov
bf4e84724f am fddc4bfe: am b1cd745f: Merge "Fail print jobs targeted to unavailable services." into klp-dev 
* commit 'fddc4bfed524df4f6245721c3ebc82ba2afbcf89':
  Fail print jobs targeted to unavailable services.
 2013-10-02 09:36:13 -07:00
Craig Mautner
c5495c93e5 am eba784f0: am 3c98926b: Merge "Add a timeout for removing starting windows." into klp-dev 
* commit 'eba784f0847a1d7c747603994d09937dcfdc0671':
  Add a timeout for removing starting windows.
 2013-10-02 09:35:49 -07:00
Jeff Sharkey
7f60e70e81 am 666b998b: am 364fc14f: Merge "Detect wedged ContentProviders, treat as ANR." into klp-dev 
* commit '666b998b67fe7bb6fc11dd6d683a18b5690afd39':
  Detect wedged ContentProviders, treat as ANR.
 2013-10-02 09:35:14 -07:00
Craig Mautner
09be37b2d3 Merge "Add debuggging for 10858941." into klp-dev 2013-10-02 05:04:07 +00:00
Craig Mautner
323f78001d Add debuggging for 10858941. 
Change-Id: I0517ccd9a83ef19a9002d61dbebf36d0120e1f63
 2013-10-01 21:16:22 -07:00
Matthew Williams
95906af264 Merge commit '0e0f6003' into manualmerge 
Conflicts:
	services/java/com/android/server/content/SyncManager.java

Change-Id: If4c3275300892934e11faa7a624c1f2486a64c08
 2013-10-01 20:54:01 -07:00
Dianne Hackborn
164371fb75 Fix issue #11005453: [SUW] G+ profile creation for new user broken 
The main problem here was a mistake when turning a single process
structure to a multi-package-process structure with a common
process.  When we cloned the original process state, if there were
any services already created for the process for that package, they
would be left with their process pointer still referencing the
original now common process instead of the package-specific process,
allowing the active counts to get bad.  Now we switch any of those
processes over to the new package-specific process.

There was also another smaller issue with how ServiceRecord is
associated with a ServiceState -- we could be waiting for an
old ServiceRecord to be destroyed while at the same time creating
a new ServiceRecord for that same service class.  These would share
the same ServiceState, so when the old record finally finished
destroying itself it would trample over whatever the new service
is doing.

This is fixed by changing the model to instead of using an "active"
reference count, we have an object identifying the current owner
of the ServiceState.  Then when the old ServiceRecord is cleaning
up, we know if it is still the owner at that point.

Also some other small things along the way -- new Log.wtfStack()
method that is convenient, new suite of Slog.wtf methods, fixed
some services to use Slog.wtf when catching exceptions being
returned to the caller so that we actually know about them.

Change-Id: I75674ce38050b6423fd3c6f43d1be172b470741f
 2013-10-01 20:51:12 -07:00
Adam Lesinski
42e9b63100 Merge "Make room for new public flags" into klp-dev 2013-10-02 01:55:09 +00:00
Craig Mautner
1cbb42dfea am 7d4e6365: am 312ab4bd: Merge "Don\'t display hidden activities over home screen." into klp-dev 
* commit '7d4e6365fb87c198ca54fc1d8e979b67d578c28a':
  Don't display hidden activities over home screen.
 2013-10-01 18:50:07 -07:00
Adam Lesinski
6a591f5859 Make room for new public flags 
Moved two hidden flags to private

bug:11033280
Change-Id: Icca867b073aff643eefdaf84df68de86bb6b05ac
 2013-10-01 18:48:20 -07:00
Jeff Brown
42544cf843 Merge "Track wireless charger detector timeout explicitly." into klp-dev 2013-10-02 01:47:55 +00:00
Carlos Valdivia
3a748632e7 am d6957d5f: Merge "Prevent authenticators from using Settings to launch arbitrary activities." into klp-dev 
* commit 'd6957d5f8ddf3b542996955bf2d6efe0e9804ef4':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2013-10-01 18:45:47 -07:00
Dianne Hackborn
81f87faede am 57d96f0e: Merge "Fix issue #10948509: Crash in procstats when there is no data" into klp-dev 
* commit '57d96f0e92e8af842878660a8271e65cec2426d3':
  Fix issue #10948509: Crash in procstats when there is no data
 2013-10-01 18:45:11 -07:00
Craig Mautner
62de783230 am 564e8e6f: Merge "Ensure correct window ordering." into klp-dev 
* commit '564e8e6f548951c9fe5825aaad327b9ffbeece82':
  Ensure correct window ordering.
 2013-10-01 18:44:54 -07:00
Craig Mautner
d476b96d71 am 64ce6b78: Merge "Don\'t kill home process with the rest of its package." into klp-dev 
* commit '64ce6b78ccb8522a6147843f4206a5b128571b03':
  Don't kill home process with the rest of its package.
 2013-10-01 18:44:50 -07:00
Craig Mautner
1c3489ae4b am 5a0c54a5: Merge "Remove home package name methods." into klp-dev 
* commit '5a0c54a5112612777becd7a0f12f74cf720c1b7f':
  Remove home package name methods.
 2013-10-01 18:44:47 -07:00
Svetoslav
a4e395057f am c6568719: Merge "Ignore historical printer records for installed services" into klp-dev 
* commit 'c6568719671206e726f260fad390680f7fb0ee9e':
  Ignore historical printer records for installed services
 2013-10-01 18:44:25 -07:00
Alan Viverette
46bb58ca69 Fix monochromacy simulation 
Change-Id: I1e42218abbb097fd657c200b37b10a734d0b86d4
 2013-10-01 18:08:35 -07:00
Jeff Brown
dbcc8a22de Track wireless charger detector timeout explicitly. 
Previously we relied on having a continue stream of sensor
events from which to detect whether the device is moving or
at rest.  However, if the sensor HAL is broken in some way
then we might not receive enough sensor events to actually
finish the detection process.  When this happens, we'll
just sit there holding a wakelock indefinitely.

Instead of relying on the sensor event stream, post a delayed
message to explicitly finish detection.

Bug: 10769163
Change-Id: Ia2ed66fe5e7c41a8832df76da9104c13554e1398
 2013-10-01 16:42:16 -07:00
Amith Yamasani
86519dd5bb Merge "Use correct method for sparsearray lookup" into klp-dev 2013-10-01 23:35:21 +00:00
Jim Miller
d273cae2c4 resolved conflicts for merge of fb2e3c8d to master 
Change-Id: Ic9fe2674e0eb82d071f9b547b6089acacf705576
 2013-10-01 15:42:45 -07:00
Craig Mautner
66de7f4fa0 Merge "Fixes to handleAppDiedLocked." into klp-dev 2013-10-01 21:44:13 +00:00
Svetoslav Ganov
b1cd745fd2 Merge "Fail print jobs targeted to unavailable services." into klp-dev 2013-10-01 21:30:53 +00:00
Craig Mautner
51277a8521 Fixes to handleAppDiedLocked. 
- Call in all circumstances but only set launchHomeTaskNext for
  focused stack. Previous version didn't call handleAppDiedLocked for
  non-focused stack.

- Rearrange logic to run down the top task and make sure that all
  remaining activities belong to the dying app. Previous version just
  looked at the top non-finishing activity and based its behavior on
  that.

Fixes bug 11029560.

Change-Id: Ic3a7c873c4c975577d6b390a8955ff41729bdfde
 2013-10-01 14:28:23 -07:00
Amith Yamasani
540b659304 Use correct method for sparsearray lookup 
Should fix the array index out of bounds. valueAt() is when we have the
index, not the key.

Bug: 11014210
Change-Id: Icb53fe763782befbd5de1b3df6630b87cda72e84
 2013-10-01 13:45:58 -07:00
Craig Mautner
3c98926bf2 Merge "Add a timeout for removing starting windows." into klp-dev 2013-10-01 20:35:01 +00:00
Alan Viverette
18c631931b Merge "Add accessibility display adjustments" 2013-10-01 18:33:01 +00:00