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

147136 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
f19fc3a6da am 7d06201c: am d1429923: Implement nice QS expansion transition in Keyguard 
* commit '7d06201ca1b8c3757b1ec211cbba6d3ff2868362':
  Implement nice QS expansion transition in Keyguard
 2014-07-31 14:29:00 +00:00
Jorim Jaggi
8758f21762 am e2a96c03: am decb0b1e: Merge "Factor out keyguard components of StatusBarHeaderView" into lmp-dev 
* commit 'e2a96c030e88c93cfcdf85d5f56d82084416ac2c':
  Factor out keyguard components of StatusBarHeaderView
 2014-07-31 14:28:56 +00:00
Christoph Studer
e14e232fff am d06301eb: am cab1943e: Merge "NoMan: Filter group children for pre-L listeners" into lmp-dev 
* commit 'd06301eb08300d7f9b25c4167eb3b45d2bfbeecb':
  NoMan: Filter group children for pre-L listeners
 2014-07-31 14:28:51 +00:00
Narayan Kamath
be41805a51 am 9b90ab03: am aa1cf141: Merge "Switch TextUtils over to new ICU API." into lmp-dev 
* commit '9b90ab03ab608fcf4cbbbbad673ff2519937fb03':
  Switch TextUtils over to new ICU API.
 2014-07-31 14:28:44 +00:00
Lorenzo Colitti
e0949acafb am 0acef547: am 35474389: Merge "Add logging of Legacy Type info." into lmp-dev 
* commit '0acef5477e6eee29fc61153d9c6ca2caa50252cd':
  Add logging of Legacy Type info.
 2014-07-31 14:28:40 +00:00
Jorim Jaggi
8950ca17d8 am d1429923: Implement nice QS expansion transition in Keyguard 
* commit 'd142992377e854f327b376726d94bf5789c8317b':
  Implement nice QS expansion transition in Keyguard
 2014-07-31 13:53:35 +00:00
Jorim Jaggi
6a09d01e0f am decb0b1e: Merge "Factor out keyguard components of StatusBarHeaderView" into lmp-dev 
* commit 'decb0b1e788fde607db04e728b9e6dd0e3a9fb66':
  Factor out keyguard components of StatusBarHeaderView
 2014-07-31 13:49:30 +00:00
Jorim Jaggi
61d37f6d1c Implement nice QS expansion transition in Keyguard 
Bug: 16010455
Bug: 15192264
Change-Id: I764652e73ea8e87ad12b9241e038bff843a0a221
 2014-07-31 13:48:43 +00:00
Christoph Studer
e123d70d7f am cab1943e: Merge "NoMan: Filter group children for pre-L listeners" into lmp-dev 
* commit 'cab1943ecd5e6360045112e330778223e218e006':
  NoMan: Filter group children for pre-L listeners
 2014-07-31 13:44:09 +00:00
Neil Fuller
364fe22ecb Merge branch 'lmp-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev-plus-aosp 2014-07-31 13:30:12 +00:00
Alexandra Gherghina
9f69eaf271 am 71fcd191: am 790bcf78: Upload new icons from ux 
* commit '71fcd1915b6b179fa47cff0d2aec3a8bed78b6e4':
  Upload new icons from ux
 2014-07-31 13:28:38 +00:00
Sander Alewijnse
f0cb383bad am 1d7e62b7: am 9d032110: Fix deadlock window manager and device policy manager. 
* commit '1d7e62b7b77fb5184feb6676669b0d2544baecd0':
  Fix deadlock window manager and device policy manager.
 2014-07-31 13:28:34 +00:00
Jae Seo
1e7100a6e6 am 6d682881: am b3e54101: TIF: Make TvTrackInfo methods more explicit. 
* commit '6d682881c2692c3566e1ab12727f7432aa8eca5e':
  TIF: Make TvTrackInfo methods more explicit.
 2014-07-31 13:28:30 +00:00
Deepanshu Gupta
3c216cc804 am c399a637: am 82bf0cf3: Merge "Fix classpath for AndroidLocale" into lmp-dev 
* commit 'c399a637bd4f934adb8d9282de32c4a76127e9a7':
  Fix classpath for AndroidLocale
 2014-07-31 13:28:25 +00:00
Dan Sandler
6000359997 am 4d8aefee: am ed3a7e7c: Merge "Fix docs build." into lmp-dev 
* commit '4d8aefeea106d6866e33bfeaf8691e791764fde3':
  Fix docs build.
 2014-07-31 13:28:21 +00:00
Wonsik Kim
ac5e7245b7 am b5c60c46: am 4092e720: Merge "TIF: fix TvInputHal bug for multiple devices" into lmp-dev 
* commit 'b5c60c467ef0dfcab27b5aa9169c37a467fe603b':
  TIF: fix TvInputHal bug for multiple devices
 2014-07-31 13:28:16 +00:00
Lajos Molnar
1a4989212c am 7153c321: am a4ec1c74: MediaCodec: clean up image/buffer caching 
* commit '7153c321852e097602162bde5ea873302796ad86':
  MediaCodec: clean up image/buffer caching
 2014-07-31 13:27:59 +00:00
Youngsang Cho
e0e0ab3c4c am 7bb0a573: am bfd63283: Merge "TIF: Reset SurfaceView whenever TvView tunes to a channel of different TV input" into lmp-dev 
* commit '7bb0a573f354fcbddf9324b57facffede8af6e1c':
  TIF: Reset SurfaceView whenever TvView tunes to a channel of different TV input
 2014-07-31 13:27:55 +00:00
Narayan Kamath
3be0ba5fcc am 39b16dd7: am bd855367: Merge "Don\'t assume languages are 2 letter codes." 
* commit '39b16dd793ba73f6f11f087b06d1bf3703cc271e':
  Don't assume languages are 2 letter codes.
 2014-07-31 13:27:35 +00:00
Narayan Kamath
035dc34861 am 8b2de134: am bb97753b: Merge "Switch TextUtils over to new ICU API." 
* commit '8b2de134a609936e49380011e904cb277205781e':
  Switch TextUtils over to new ICU API.
 2014-07-31 13:26:45 +00:00
Narayan Kamath
690892e990 am aa1cf141: Merge "Switch TextUtils over to new ICU API." into lmp-dev 
* commit 'aa1cf14150cbd656aa31d862865973ecfae76eff':
  Switch TextUtils over to new ICU API.
 2014-07-31 13:14:52 +00:00
Lorenzo Colitti
120d65d44a am 35474389: Merge "Add logging of Legacy Type info." into lmp-dev 
* commit '354743895d837b18e906b3e9a9f4d58a558057d7':
  Add logging of Legacy Type info.
 2014-07-31 13:14:47 +00:00
Alexandra Gherghina
ae02440de8 am 790bcf78: Upload new icons from ux 
* commit '790bcf781e5e09ac12e76267073f41555e95f2c9':
  Upload new icons from ux
 2014-07-31 13:07:06 +00:00
Sander Alewijnse
f179fe3672 am 9d032110: Fix deadlock window manager and device policy manager. 
* commit '9d0321100fa16cc702ee9335cd761665d5acdba2':
  Fix deadlock window manager and device policy manager.
 2014-07-31 13:06:57 +00:00
Jae Seo
ce20ee54de am b3e54101: TIF: Make TvTrackInfo methods more explicit. 
* commit 'b3e541017acd52ea405e04662834694f6aa30987':
  TIF: Make TvTrackInfo methods more explicit.
 2014-07-31 13:06:47 +00:00
Deepanshu Gupta
0d50b99ead am 82bf0cf3: Merge "Fix classpath for AndroidLocale" into lmp-dev 
* commit '82bf0cf3716410eb47a8f3c40c414b1bd1b3a018':
  Fix classpath for AndroidLocale
 2014-07-31 13:06:39 +00:00
Dan Sandler
0d985df794 am ed3a7e7c: Merge "Fix docs build." into lmp-dev 
* commit 'ed3a7e7c9a44d9717f7d1d1c444fbc751d9b3a6f':
  Fix docs build.
 2014-07-31 13:06:34 +00:00
Wonsik Kim
46307604ab am 4092e720: Merge "TIF: fix TvInputHal bug for multiple devices" into lmp-dev 
* commit '4092e720029d6e682fadbb031a8d5a96c4ce666c':
  TIF: fix TvInputHal bug for multiple devices
 2014-07-31 13:06:26 +00:00
Lajos Molnar
d9906b2bb4 am a4ec1c74: MediaCodec: clean up image/buffer caching 
* commit 'a4ec1c7446b52fef02eb310929849ba54f22b50f':
  MediaCodec: clean up image/buffer caching
 2014-07-31 13:06:13 +00:00
Youngsang Cho
9a5d3292f6 am bfd63283: Merge "TIF: Reset SurfaceView whenever TvView tunes to a channel of different TV input" into lmp-dev 
* commit 'bfd63283929ae02f5846d0d85fe75ade70b4107b':
  TIF: Reset SurfaceView whenever TvView tunes to a channel of different TV input
 2014-07-31 13:05:55 +00:00
Narayan Kamath
39b16dd793 am bd855367: Merge "Don\'t assume languages are 2 letter codes." 
* commit 'bd855367c41d588e9a3305d188707dde5b2c0a0a':
  Don't assume languages are 2 letter codes.
 2014-07-31 12:16:38 +00:00
Narayan Kamath
8b2de134a6 am bb97753b: Merge "Switch TextUtils over to new ICU API." 
* commit 'bb97753bc546c7725652b68e6611a75350573466':
  Switch TextUtils over to new ICU API.
 2014-07-31 11:34:49 +00:00
Alexandra Gherghina
2f1cee80eb Upload new icons from ux 
Change-Id: I47da0780b1a4cce1104ae8fc00fcf01701a6d27a
 2014-07-31 10:27:24 +00:00
Sander Alewijnse
a87863a8bd Fix deadlock window manager and device policy manager. 
Removed all communication from wm to device policy manager.
Added initialization of cache in wm by dpms.

Change-Id: Ifa0b8bfcd625464b156d5cc0fb66d342deda1c27
 2014-07-31 09:16:46 +00:00
Jae Seo
d5ce975952 TIF: Make TvTrackInfo methods more explicit. 
This change addresses the following API council feedback:

TvTrackInfo:
-- Remove all KEY_/VALUE_ constants, and replace with explicit,
   strongly-typed accessor methods.
-- Add additional Bundle getExtras() method (in addition to the explicit
   types); most of the time this Bundle will be null.

Bug: 16542165
Change-Id: Ie48cb170b2bbf07d9460fdc8ed77d7db01799772
 2014-07-31 16:15:51 +09:00
Lajos Molnar
bacc82a509 MediaCodec: clean up image/buffer caching 
- cachedBuffers will be null in async mode
- track dequeued buffers in a map
- free dequeued buffers & bytebuffers

Bug: 14297827
Bug: 11990118
Change-Id: I9f8255921de25d05bf2c11fdaeda45cc185b9dd7
 2014-07-30 23:06:11 -07:00
Craig Mautner
532f732838 resolved conflicts for merge of 5c4b5ede to lmp-dev-plus-aosp 
Conflicts:
	services/java/com/android/server/am/ActivityManagerService.java

Change-Id: Id6ece6daa4a36dc8479f5bce867cce3b42b3ef70
 2014-07-30 22:37:11 -07:00
Craig Mautner
5c4b5eded6 am 6a58309e: Merge "[ActivityManager] Prevent coredump file may not complete for testing." 
* commit '6a58309e734086a21580dd8d9175ac1817ca3ab2':
  [ActivityManager] Prevent coredump file may not complete for testing.
 2014-07-31 04:01:35 +00:00
Craig Mautner
689e275292 am f37034ac: am 905fe15e: Merge "[ActivityManager] Avoid mistaking visibility by finishing task." 
* commit 'f37034aca6e04d170a3abd2e9b19dcfd711c4e82':
  [ActivityManager] Avoid mistaking visibility by finishing task.
 2014-07-31 04:00:56 +00:00
Craig Mautner
f37034aca6 am 905fe15e: Merge "[ActivityManager] Avoid mistaking visibility by finishing task." 
* commit '905fe15ea09238ed132ccd347e078892b6b49ddf':
  [ActivityManager] Avoid mistaking visibility by finishing task.
 2014-07-31 03:57:33 +00:00
Lorenzo Colitti
7799943e5c am 6f088df9: am 44551060: Allow using third-party HTTP/... stacks for per-network URLs. 
* commit '6f088df9a2aafd4979265307a16bbc61a6c54d1c':
  Allow using third-party HTTP/... stacks for per-network URLs.
 2014-07-31 03:07:40 +00:00
Lorenzo Colitti
672d5c8965 am 44551060: Allow using third-party HTTP/... stacks for per-network URLs. 
* commit '44551060ffdc8932fcdd2dded75ac9207db6ae84':
  Allow using third-party HTTP/... stacks for per-network URLs.
 2014-07-31 03:01:59 +00:00
Lorenzo Colitti
5b37fa2ed5 Allow using third-party HTTP/... stacks for per-network URLs. 
Also switch to double-checked locking for
mNetworkBoundSocketFactory and OkHttpClient.

Change-Id: Ic52776ee760036ad5623b7496156b8909dc282fa
 2014-07-31 02:17:28 +00:00
Yuncheol Heo
136b060cb2 am 824dd785: am 63674ed0: Don\'t clear local device when it goes to the standby mode. 
* commit '824dd785674aba7f204cf30898463153f18f53a9':
  Don't clear local device when it goes to the standby mode.
 2014-07-31 01:40:22 +00:00
Yuncheol Heo
1c04780385 am 63674ed0: Don\'t clear local device when it goes to the standby mode. 
* commit '63674ed0034f44ffdd39c1eba590b8dd26fa6464':
  Don't clear local device when it goes to the standby mode.
 2014-07-31 01:36:06 +00:00
Yuncheol Heo
4b54271f1b Don't clear local device when it goes to the standby mode. 
Some OEM/SOC will keep passing the received packets until the
application processor goes to the sleep mode actually.  so we'll
not clear the local devices to get the received packets and react
like in the standby mode.

Bug: 16661406
Change-Id: I6eb9c21877a29905bb0084256dc6692fe0d07170
 2014-07-31 10:31:15 +09:00
Shishir Agrawal
28bfd3810d am 1d678b52: am 20832529: Merge "Add new APIs iccExchangeSimIO and iccTransmitApduBasicChannel to TelephonyManager." into lmp-dev 
* commit '1d678b5277b5d96a53481c8b6934b755b6973ab7':
  Add new APIs iccExchangeSimIO and iccTransmitApduBasicChannel to TelephonyManager.
 2014-07-31 01:18:58 +00:00
Andres Morales
0e6bab86ae am 9884a1ac: am 3df55fc3: NFC Unlock api changes 
* commit '9884a1ac65522d381c8a5682cc6804a3c6378dd9':
  NFC Unlock api changes
 2014-07-31 01:18:54 +00:00
Shishir Agrawal
2682030a73 am 20832529: Merge "Add new APIs iccExchangeSimIO and iccTransmitApduBasicChannel to TelephonyManager." into lmp-dev 
* commit '20832529b27a523738ae46c2da036bcf2bb09011':
  Add new APIs iccExchangeSimIO and iccTransmitApduBasicChannel to TelephonyManager.
 2014-07-31 01:13:52 +00:00
Andres Morales
ce3a35f41f am 3df55fc3: NFC Unlock api changes 
* commit '3df55fc32ec023f40a1cb22653d50915e05316c4':
  NFC Unlock api changes
 2014-07-31 01:13:48 +00:00