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

114004 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Yu Shan Emily Lau
8e09984a56 am 98d18bbc: Merge "Fix media stress test." into klp-dev 
* commit '98d18bbc5e59c98c890593d521b5b641030a5f1d':
  Fix media stress test.
 2013-09-16 14:15:52 -07:00
John Spurlock
d67ec25a9c Update transient navigation confirmation wording & behavior 
1. Decrease transient navigation confirmation annoyance.

  - Only use the power-key as a signal if we detect a screen-off
    screen-on within a short threshold value.

 - Auto-confirm if user performs the indicated gesture.

 - Remember confirmation across reboots.

2. Update wording to new final wording.  Remove now obsolete
short + long versions.  Decrease message font temporarily
until the new platform toast redesign is finalized.

3. Remove pre-ship ImmersiveModeTesting debug helper.

Bug:10602929
Change-Id: I0bff826391058c7b282eeb61817b93b79de84893
 2013-09-16 17:12:17 -04:00
Xia Wang
326f4505e0 Merge "Update the Connectivity Manager test suit to use InstrumentationTestCase." into klp-dev 2013-09-16 21:11:31 +00:00
Yu Shan Emily Lau
98d18bbc5e Merge "Fix media stress test." into klp-dev 2013-09-16 21:11:25 +00:00
Chet Haase
ea3b4506f3 am 8b575ec3: am c05c3628: Merge "Ensure that transitions animating alpha end on a reasonable value" into klp-dev 
* commit '8b575ec3a733d5e08b0fc9ce995d2aa2148f47a6':
  Ensure that transitions animating alpha end on a reasonable value
 2013-09-16 14:08:26 -07:00
Igor Murashkin
8f64e3cd42 am 14297141: am 5cf86aa7: Merge "media: Update ImageReader to remove MaxImagesAcquiredException" into klp-dev 
* commit '142971418c8e9ca539dae40f3c2532956f258e6b':
  media: Update ImageReader to remove MaxImagesAcquiredException
 2013-09-16 14:08:23 -07:00
Xia Wang
19306af73a Update the Connectivity Manager test suit to use InstrumentationTestCase. 
- Remove ConnectivityManagerTestActivity as the test activity could be destroyed
  after a system config change, which cause test failure in the wifi stress test.
- Update all tests to use InstrumentationTestCase, which instruments the test package.

Bug : 10426067

Change-Id: Ibf6f1f7cffd7a7eabc4cc63c7e033b59274b724e
 2013-09-16 14:07:25 -07:00
Dianne Hackborn
35f72be50b Implement issue #10691359: Kill long-running processes 
We now have the activity manager kill long-running processes
during idle maintanence.

This involved adding some more information to the activity manager
about the current memory state, so that it could know if it really
should bother killing anything.  While doing this, I also improved
how we determine when memory is getting low by better ignoring cases
where processes are going away for other reasons (such as now idle
maintenance).  We now won't raise our memory state if either a process
is going away because we wanted it gone for another reason or the
total number of processes is not decreasing.

The idle maintanence killing also uses new per-process information
about whether the process has ever gone into the cached state since
the last idle maintenance, and the initial pss and current pss size
over its run time.

Change-Id: Iceaa7ffb2ad2015c33a64133a72a272b56dbad53
 2013-09-16 14:05:34 -07:00
Chet Haase
8b575ec3a7 am c05c3628: Merge "Ensure that transitions animating alpha end on a reasonable value" into klp-dev 
* commit 'c05c36285dbc715e851671cb4495d376743c4399':
  Ensure that transitions animating alpha end on a reasonable value
 2013-09-16 14:05:18 -07:00
Igor Murashkin
142971418c am 5cf86aa7: Merge "media: Update ImageReader to remove MaxImagesAcquiredException" into klp-dev 
* commit '5cf86aa7564eff8443158644e866a420d865b1bc':
  media: Update ImageReader to remove MaxImagesAcquiredException
 2013-09-16 14:05:14 -07:00
Chet Haase
c05c36285d Merge "Ensure that transitions animating alpha end on a reasonable value" into klp-dev 2013-09-16 21:03:28 +00:00
Igor Murashkin
5cf86aa756 Merge "media: Update ImageReader to remove MaxImagesAcquiredException" into klp-dev 2013-09-16 21:02:32 +00:00
Chet Haase
23c61f6bc5 Ensure that transitions animating alpha end on a reasonable value 
The Fade transition sets an initial alpha value of 0 when items are
appearing. This makes items invisible to start with, and then they
eventually fade in as part of the transition when the transition's
animation runs.

But if that animation/transition gets interrupted, or not started, then
the alpha value would not be restored, and the value would stay 0,
making the items invisible indefinitely. This is what was happening in
the action bar of the People app when performing a search.

The fix is to handle Transition and animation events to restore the alpha
to its true value when the transition completes, whether that
transition is canceled or not.

Issue #10726905 ActionBar weirdness in People app

Change-Id: Idb65fd8d471d2ac0a1ddc243fee00ae99f7e72d8
 2013-09-16 13:58:23 -07:00
Yuhao Zheng
3cb31ed094 am 69ea6665: am af672998: Merge "Fix Settings app crash while enabling tethering" into klp-dev 
* commit '69ea666520af496b6cd1c106df727d74be70c491':
  Fix Settings app crash while enabling tethering
 2013-09-16 13:42:36 -07:00
Yuhao Zheng
69ea666520 am af672998: Merge "Fix Settings app crash while enabling tethering" into klp-dev 
* commit 'af672998af7fb0bba90f7d56504584a63ff189fa':
  Fix Settings app crash while enabling tethering
 2013-09-16 13:39:35 -07:00
Yuhao Zheng
af672998af Merge "Fix Settings app crash while enabling tethering" into klp-dev 2013-09-16 20:36:50 +00:00
Vinit Deshapnde
998c7007d1 am 664b5df7: am 7354b834: Merge "Fix an NPE in WifiService" into klp-dev 
* commit '664b5df781c2ee7784800a9d86c5ee33edeb512c':
  Fix an NPE in WifiService
 2013-09-16 13:31:51 -07:00
Vinit Deshapnde
664b5df781 am 7354b834: Merge "Fix an NPE in WifiService" into klp-dev 
* commit '7354b834fc53a9d1885553aea58f632df16a5655':
  Fix an NPE in WifiService
 2013-09-16 13:29:05 -07:00
Vinit Deshapnde
7354b834fc Merge "Fix an NPE in WifiService" into klp-dev 2013-09-16 20:25:52 +00:00
Igor Murashkin
5454e3ddcc am 720b1fce: am 26cb5fd5: Merge "media: Update ImageReader APIs" into klp-dev 
* commit '720b1fcecd6c21bf4fbe6d3822e52c8a092b93c4':
  media: Update ImageReader APIs
 2013-09-16 13:24:58 -07:00