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

147105 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Andres Morales
11d2e53dc0 NFC Unlock api changes 
Bug: 16401635
Change-Id: I994bd80be40052c2f894199bb44ebbde40077f27
 2014-07-31 01:09:02 +00:00
destradaa
10d6ac9f42 am b46316dd: am 823ac05c: Add support for sources in Geofencing APIs. 
* commit 'b46316ddee783ed75b1155a89004a3cb00a0426f':
  Add support for sources in Geofencing APIs.
 2014-07-30 23:46:24 +00:00
destradaa
b9d8f99fdd am 823ac05c: Add support for sources in Geofencing APIs. 
* commit '823ac05cce1c324b8d9c8688b89a439fdfae6600':
  Add support for sources in Geofencing APIs.
 2014-07-30 23:42:50 +00:00
destradaa
f9a274c9b8 Add support for sources in Geofencing APIs. 
Support setting the source when adding geofences.
b/14117199

Surface the source when FLP geofence changes state.
b/14119200

Change-Id: I50dc40a9caee400594e1778c98e284e0db0d5e66
 2014-07-30 23:35:08 +00:00
Deepanshu Gupta
8d367bcd22 Merge "Fix classpath for AndroidLocale" into lmp-dev 2014-07-30 23:34:26 +00:00
Deepanshu Gupta
72c60ab7d4 Fix classpath for AndroidLocale 
Change-Id: I9af9ac05ec26f12529d51e566bf38789a2579390
 2014-07-31 05:10:03 +00:00
Ruben Brunk
2a9bd01d3d am 6946415f: am e95f2a0e: camera2: Implement request templates for LEGACY. 
* commit '6946415f57e1af4988c2422eb62577165b24ff24':
  camera2: Implement request templates for LEGACY.
 2014-07-30 23:23:34 +00:00
Ruben Brunk
0c1a5a8d59 am e95f2a0e: camera2: Implement request templates for LEGACY. 
* commit 'e95f2a0ee4f3062ca42dc4fc1c128172df651969':
  camera2: Implement request templates for LEGACY.
 2014-07-30 23:18:07 +00:00
Ruben Brunk
6a7d8c4289 camera2: Implement request templates for LEGACY. 
Bug: 15116722
Change-Id: Ic32e2f597997489642e98bfd8c7582a300f6f29b
 2014-07-30 23:15:16 +00:00
Yao Chen
56942738d0 am 89ad0a89: am 2705fc25: Adds toString() in MediaBrowserItem 
* commit '89ad0a8911980ff2d458d5ccf96239b2f59e9ee7':
  Adds toString() in MediaBrowserItem
 2014-07-30 22:52:37 +00:00
Yao Chen
61e3ee49b6 am 2705fc25: Adds toString() in MediaBrowserItem 
* commit '2705fc25c7c0c7c9e04fa52a05fff7dcd277a71a':
  Adds toString() in MediaBrowserItem
 2014-07-30 22:48:13 +00:00
Yao Chen
4056871031 Adds toString() in MediaBrowserItem 
Bug: 16676746
Change-Id: I61152dca66e6715807868a5c72a1fdf06c78d7ab
 2014-07-30 15:36:25 -07:00
Ruben Brunk
a938df8501 am ecdb20ca: am 3916e3ba: camera2: Add scene and effect mode for LEGACY. 
* commit 'ecdb20cab808f1e9424a9f234f4d528ed1b3956f':
  camera2: Add scene and effect mode for LEGACY.
 2014-07-30 22:19:40 +00:00
Ruben Brunk
2b776ec710 am 3916e3ba: camera2: Add scene and effect mode for LEGACY. 
* commit '3916e3ba989cae92246c35c02f8230bc2cdc2505':
  camera2: Add scene and effect mode for LEGACY.
 2014-07-30 22:15:04 +00:00
Ruben Brunk
3fe9eba904 camera2: Add scene and effect mode for LEGACY. 
Bug: 15116722

Change-Id: I0797fccb5fdd8b959622c100f25b2950cfe4e115
 2014-07-30 22:09:41 +00:00
Adam Lesinski
de581a0578 am 872df53b: am bb8ac196: Add shared library support to aapt dump 
* commit '872df53bc44fb08a93c1ad0cd8fb3e42f076734f':
  Add shared library support to aapt dump
 2014-07-30 22:02:44 +00:00
Adam Lesinski
47b94ed322 am bb8ac196: Add shared library support to aapt dump 
* commit 'bb8ac19684449644bd5218b57c9b14b3de12818e':
  Add shared library support to aapt dump
 2014-07-30 21:58:40 +00:00
Adam Lesinski
63e646eed5 Add shared library support to aapt dump 
AAPT dump should be able to handle dynamic references
that often come with shared library resources.

Bug:16678251
Change-Id: I6c8cd943145aab20ca9db9694c8c433b3c64279b
 2014-07-30 21:53:48 +00:00
Behdad Esfahbod
365cebd700 am 74b5b699: am 8bbd753a: Support FontFeatureSettings in Paint 
* commit '74b5b699e634031042204aa9a085b3c96d84854e':
  Support FontFeatureSettings in Paint
 2014-07-30 21:46:04 +00:00