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

114024 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
693273dbeb am 9202e085: am a0d53c61: Merge "Fix issue #10779747: Calendar Storage crash observed..." into klp-dev 
* commit '9202e085d29d4c27af8de9fcbc910245e9d18fc1':
  Fix issue #10779747: Calendar Storage crash observed...
 2013-09-16 19:19:30 -07:00
Dianne Hackborn
9202e085d2 am a0d53c61: Merge "Fix issue #10779747: Calendar Storage crash observed..." into klp-dev 
* commit 'a0d53c61886b683b0cc9dccdb5b6fe581356b920':
  Fix issue #10779747: Calendar Storage crash observed...
 2013-09-16 19:16:41 -07:00
Christopher Tate
dd5c11e692 am 0ff08a60: am ca776158: Merge "Don\'t assume that transport unbind == transport invalid" into klp-dev 
* commit '0ff08a6079f377d30b05d0f6bbf157058a626692':
  Don't assume that transport unbind == transport invalid
 2013-09-16 19:16:02 -07:00
Christopher Tate
0ff08a6079 am ca776158: Merge "Don\'t assume that transport unbind == transport invalid" into klp-dev 
* commit 'ca776158b7be48d8cba862fccf7b9709856ae61a':
  Don't assume that transport unbind == transport invalid
 2013-09-16 19:13:14 -07:00
Dianne Hackborn
a0d53c6188 Merge "Fix issue #10779747: Calendar Storage crash observed..." into klp-dev 2013-09-17 02:12:58 +00:00
Zhijun He
465d3f4e48 am 6ab1f235: am 48811160: Merge "ImageReader: fix the 0 crop rect size issue" into klp-dev 
* commit '6ab1f2355ca8f9464954ee8bf720fcfc7449052d':
  ImageReader: fix the 0 crop rect size issue
 2013-09-16 19:12:34 -07:00
Christopher Tate
ca776158b7 Merge "Don't assume that transport unbind == transport invalid" into klp-dev 2013-09-17 02:10:40 +00:00
Zhijun He
6ab1f2355c am 48811160: Merge "ImageReader: fix the 0 crop rect size issue" into klp-dev 
* commit '4881116047f72f4406cb88cbb2f324c06f9a292f':
  ImageReader: fix the 0 crop rect size issue
 2013-09-16 19:09:46 -07:00
Zhijun He
4881116047 Merge "ImageReader: fix the 0 crop rect size issue" into klp-dev 2013-09-17 02:07:21 +00:00
Dianne Hackborn
0d97cd1f6a Fix issue #10779747: Calendar Storage crash observed... 
...while setting up a new user from settings.

The delayed service start stuff was too aggressive -- it would
allow a process to be killed between the an onReceive() that calls
startService() and that service being started.  This means that
apps that set up global state that they expect to remain set up
during that time could be lost.

This is the first part of a fix, which tightens up when we allow
services to be delayed.  Now we will immediately start the service
as long as it currently as a process running that is not in the
cached state.  (Previously we would delay if the process was in
the receiver state.)

This unfortunately means that our service start delay is much
less effective.  To address that, there will be a follow-on change
to tie broadcast delivery into this to see if we can delay the
finish of a broadcast as long as there are background services
starting in that process.

Change-Id: I2bba2295d10699ee3479375bbe87114b2cbb0826
 2013-09-16 19:02:52 -07:00
Dianne Hackborn
5f318189f2 am bb7a51e1: am 8a7a93e2: Merge "Work on issue #10771346: runtime restart" into klp-dev 
* commit 'bb7a51e1ef28e26a8ead2c0cf3d6880081526d52':
  Work on issue #10771346: runtime restart
 2013-09-16 18:50:01 -07:00
Dianne Hackborn
bb7a51e1ef am 8a7a93e2: Merge "Work on issue #10771346: runtime restart" into klp-dev 
* commit '8a7a93e20d8755602938a56d4a88398baf2359e4':
  Work on issue #10771346: runtime restart
 2013-09-16 18:47:19 -07:00
Dianne Hackborn
8a7a93e20d Merge "Work on issue #10771346: runtime restart" into klp-dev 2013-09-17 01:43:09 +00:00
Christopher Tate
a8de43fd8c Don't assume that transport unbind == transport invalid 
We now expect that the transport service's host process will be
OOM-killed sometimes, but will come back automatically because we
still hold the binding.  So, we no longer drop it as the
expected-to-be-current transport when that happens.

Bug 10728767

Change-Id: I5e756e8942e7c4c3567632f10460ee31b9618d75
 2013-09-16 18:14:52 -07:00
Christopher Tate
4b8dd603cf am cf611b77: am 60fcce6c: Merge "Introduce maxSdkVersion for <uses-permission>" into klp-dev 
* commit 'cf611b776ed5163008fdad87452f3047c966ec08':
  Introduce maxSdkVersion for <uses-permission>
 2013-09-16 18:09:04 -07:00
Christopher Tate
cf611b776e am 60fcce6c: Merge "Introduce maxSdkVersion for <uses-permission>" into klp-dev 
* commit '60fcce6cb1bbe720634ae5e3d94aeae5e4c1e53e':
  Introduce maxSdkVersion for <uses-permission>
 2013-09-16 18:06:27 -07:00
Christopher Tate
60fcce6cb1 Merge "Introduce maxSdkVersion for <uses-permission>" into klp-dev 2013-09-17 01:01:47 +00:00
Jean-Michel Trivi
4d567f538d am 49e12b69: am 3fb53d82: Merge "Loudness enhancer audio effect" into klp-dev 
* commit '49e12b699df1a132445640afd1403b47dc5b4bee':
  Loudness enhancer audio effect
 2013-09-16 17:59:56 -07:00
Jean-Michel Trivi
49e12b699d am 3fb53d82: Merge "Loudness enhancer audio effect" into klp-dev 
* commit '3fb53d8238c0ccec275237cf4f4962f2a00eab7e':
  Loudness enhancer audio effect
 2013-09-16 17:54:07 -07:00
Jean-Michel Trivi
3fb53d8238 Merge "Loudness enhancer audio effect" into klp-dev 2013-09-17 00:52:19 +00:00
Dianne Hackborn
50ef0b62f0 Work on issue #10771346: runtime restart 
Haven't found the underlying cause, but this will give us more
information when we get into the bad state.

Change-Id: I9aebd3a025a7c0d931f43098461b64ee3c220746
 2013-09-16 17:40:27 -07:00
Christopher Tate
fb0676a902 Introduce maxSdkVersion for <uses-permission> 
This way an application can automatically sunset its permission requests
when running on later versions of the OS where those permissions are no
longer relevant, but may be alarming to the user.  A canonical example
is WRITE_EXTERNAL_STORAGE, which as of KLP becomes unnecessary for an app
to use the external storage volume solely for its own large-data needs,
without the need for actual file-system sharing among multiple apps.

Bug 9761041

Change-Id: I60130af3a108fe4a750c356038a1c8cb897e9c8b
 2013-09-16 17:03:02 -07:00
Vinit Deshapnde
d1fa1bb690 am 007c6c7d: am c06b1db2: Merge "Consider current EAP TLS configurations as \'valid\'" into klp-dev 
* commit '007c6c7d358fc617252da40c9ff214f55312c6f8':
  Consider current EAP TLS configurations as 'valid'
 2013-09-16 16:58:46 -07:00
Vinit Deshapnde
007c6c7d35 am c06b1db2: Merge "Consider current EAP TLS configurations as \'valid\'" into klp-dev 
* commit 'c06b1db22278f00ef55b2fff00bf9d905286d6e0':
  Consider current EAP TLS configurations as 'valid'
 2013-09-16 16:56:12 -07:00
Vinit Deshapnde
c06b1db222 Merge "Consider current EAP TLS configurations as 'valid'" into klp-dev 2013-09-16 23:52:57 +00:00
Matthew Williams
259b9945d2 Merge "Pending op fix didn't merge properly from KLP-dev." 2013-09-16 23:14:19 +00:00
John Spurlock
9dfcf1f311 am 74d21364: am c8d19b89: Merge "Update transient navigation confirmation wording & behavior" into klp-dev 
* commit '74d2136477bdea626edbfa2e36b1a0ea7c777b40':
  Update transient navigation confirmation wording & behavior
 2013-09-16 16:11:09 -07:00
John Spurlock
74d2136477 am c8d19b89: Merge "Update transient navigation confirmation wording & behavior" into klp-dev 
* commit 'c8d19b894ebe659d9508a9a4763388d8573c6d76':
  Update transient navigation confirmation wording & behavior
 2013-09-16 16:08:09 -07:00
Zhijun He
9e6d073a99 ImageReader: fix the 0 crop rect size issue 
Rect isValid actually include the zero size case, which we don't want to include
in our case. This causes camera ImageReader test case fails at buffer size
sanity check.

Bug: 9802344
Change-Id: I561f5a049c6117c613df1e1b2789c43af9a19628
 2013-09-16 16:03:36 -07:00
John Spurlock
c8d19b894e Merge "Update transient navigation confirmation wording & behavior" into klp-dev 2013-09-16 23:03:25 +00:00
Igor Murashkin
a250b071da am 3877a865: am 1e4e3825: Merge "camera2: Add key enumeration functionality to CameraMetadata" into klp-dev 
* commit '3877a8650781c2b63d9cd195bc9a022dc7b365c9':
  camera2: Add key enumeration functionality to CameraMetadata
 2013-09-16 15:54:12 -07:00
Igor Murashkin
3877a86507 am 1e4e3825: Merge "camera2: Add key enumeration functionality to CameraMetadata" into klp-dev 
* commit '1e4e38252f8eb44fe382e371e29857834cf9fc15':
  camera2: Add key enumeration functionality to CameraMetadata
 2013-09-16 15:51:16 -07:00
Igor Murashkin
1e4e38252f Merge "camera2: Add key enumeration functionality to CameraMetadata" into klp-dev 2013-09-16 22:47:07 +00:00
Igor Murashkin
77cd5ace33 am ad2b04a6: am 901be0ae: Merge "camera2: Update Face class." into klp-dev 
* commit 'ad2b04a6f167f8574c7e0efbf8c30b15fa966b5b':
  camera2: Update Face class.
 2013-09-16 15:43:53 -07:00
Igor Murashkin
ad2b04a6f1 am 901be0ae: Merge "camera2: Update Face class." into klp-dev 
* commit '901be0ae33faf8ece17170b0d9d4c4429121b6ab':
  camera2: Update Face class.
 2013-09-16 15:39:51 -07:00
Igor Murashkin
901be0ae33 Merge "camera2: Update Face class." into klp-dev 2013-09-16 22:32:11 +00:00
Dianne Hackborn
68ba583b79 am 366894b5: am 0a6a80f4: Fix build. 
* commit '366894b544e723b11f591a3071599066d0ada2da':
  Fix build.
 2013-09-16 15:29:46 -07:00
Dianne Hackborn
366894b544 am 0a6a80f4: Fix build. 
* commit '0a6a80f43de1b64b452aff2cbb6bdbfc9915c2a9':
  Fix build.
 2013-09-16 15:26:16 -07:00
Matthew Williams
06485a7c6e Pending op fix didn't merge properly from KLP-dev. 
Manually merge in Cl c/342668. Add another test to ensure that it
WAI.

Change-Id: Iae603328d525cc71e4e31ad30a13384efc50f823
 2013-09-16 15:23:41 -07:00
Dianne Hackborn
0a6a80f43d Fix build. 
Change-Id: I2b2168ff3b2826a60353fd137a2fa255b1ace4bb
 2013-09-16 15:20:27 -07:00
Vinit Deshapnde
3b25f51609 Consider current EAP TLS configurations as 'valid' 
Multiple authentication methods are currently considered invalid; but
WPA_EAP and IEEE8021X are set simultaneously. This means we need to
fix code to consider them a valid combination.

Bug: 10325089

Change-Id: I2b4f4d75f21df78bfca66a930e85214c0cd6922e
 2013-09-16 15:09:21 -07:00
Dianne Hackborn
df2dae01b0 am 40489be9: am 61158244: Merge "Implement issue #10691359: Kill long-running processes" into klp-dev 
* commit '40489be90b7c145da75034f793932500f0e5d380':
  Implement issue #10691359: Kill long-running processes
 2013-09-16 14:37:30 -07:00
Dianne Hackborn
40489be90b am 61158244: Merge "Implement issue #10691359: Kill long-running processes" into klp-dev 
* commit '61158244b42df547ecf8ca145d539c814b154a4a':
  Implement issue #10691359: Kill long-running processes
 2013-09-16 14:34:55 -07:00
Dianne Hackborn
61158244b4 Merge "Implement issue #10691359: Kill long-running processes" into klp-dev 2013-09-16 21:33:04 +00:00
Craig Mautner
afada2c7dc am 660a7fde: am deec7e48: Merge "Put next task on top of stack if top is finishing." into klp-dev 
* commit '660a7fdef3c1ca8ce148a1978ad5c24d6a013bea':
  Put next task on top of stack if top is finishing.
 2013-09-16 14:29:43 -07:00
Craig Mautner
660a7fdef3 am deec7e48: Merge "Put next task on top of stack if top is finishing." into klp-dev 
* commit 'deec7e481a403749ec3977c946192abbc5c5501e':
  Put next task on top of stack if top is finishing.
 2013-09-16 14:27:15 -07:00
Craig Mautner
deec7e481a Merge "Put next task on top of stack if top is finishing." into klp-dev 2013-09-16 21:21:11 +00:00
Xia Wang
b2ca5bf607 am bac2fcac: am 326f4505: Merge "Update the Connectivity Manager test suit to use InstrumentationTestCase." into klp-dev 
* commit 'bac2fcacbef1366327aa3450d6be942688fb6a68':
  Update the Connectivity Manager test suit to use InstrumentationTestCase.
 2013-09-16 14:19:18 -07:00
Yu Shan Emily Lau
5a1490a75c am 8e09984a: am 98d18bbc: Merge "Fix media stress test." into klp-dev 
* commit '8e09984a56a4ff12c8726d7c2c6902f1bf081d6f':
  Fix media stress test.
 2013-09-16 14:19:15 -07:00
Xia Wang
bac2fcacbe am 326f4505: Merge "Update the Connectivity Manager test suit to use InstrumentationTestCase." into klp-dev 
* commit '326f4505e04b24f384e84da7efcefab256777a27':
  Update the Connectivity Manager test suit to use InstrumentationTestCase.
 2013-09-16 14:15:55 -07:00