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

146900 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
6dea9bec3f am 8bbd753a: Support FontFeatureSettings in Paint 
* commit '8bbd753a20cc3fdcc4e92fb99e807b5a69cae6b2':
  Support FontFeatureSettings in Paint
 2014-07-30 21:42:22 +00:00
Behdad Esfahbod
805f6ebf17 Support FontFeatureSettings in Paint 
New API is hidden.

Bug: 15246510
Change-Id: Idefca06a366de0d87f53d123b5291788448de4d0
 2014-07-30 21:38:23 +00:00
Andres Morales
8d249222c7 am bdb80096: Merge "Revert "NFC Unlock api changes"" into lmp-dev 
* commit 'bdb800965afbb3a4b94ed5a43ef3662d703ebb31':
  Revert "NFC Unlock api changes"
 2014-07-30 21:34:36 +00:00
Alan Viverette
0e0d9ac023 am 077daef9: Merge "Update switch assets, fix SearchView asset 9-patch areas" into lmp-dev 
* commit '077daef9a28827318790f134adae6d8cd56fd1d3':
  Update switch assets, fix SearchView asset 9-patch areas
 2014-07-30 21:26:24 +00:00
keunyoung
d099c80959 am 4d2751c5: Merge "add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode" into lmp-dev 
* commit '4d2751c5596b9a8e85635db483ffd91091ccc557':
  add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode
 2014-07-30 21:26:20 +00:00
Andres Morales
cc4fe46e58 am 9fef5fbc: NFC Unlock api changes 
* commit '9fef5fbcd6d47ef86823b3a2d82d34801f9be335':
  NFC Unlock api changes
 2014-07-30 21:21:22 +00:00
Joe Fernandez
3f6bb54b73 am 2c3b3f53: am a3e52154: am ecf76d1c: am b83127f0: Merge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ" into klp-modular-docs 
* commit '2c3b3f53b848c627744b3dd78a4b7aa654e73109':
  docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ
 2014-07-30 21:21:18 +00:00
Alan Lau
046712cd23 am 990606f0: am 40274ada: (-s ours) am b12318be: Merge "Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""" into klp-modular-dev 
* commit '990606f0fb6b03838f40eb5a5f2fa1fbb9c257d1':
  Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""
 2014-07-30 21:21:14 +00:00
Alan Lau
b40b57eab3 am 1e438bef: am 839ca0d5: (-s ours) am 06a84554: Merge "Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""" into klp-modular-dev 
* commit '1e438befc1cc2716f23573c3253cf4b24377ad07':
  Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""
 2014-07-30 21:21:10 +00:00
Andres Morales
131197aa6e NFC Unlock api changes 
Bug: 16401635
Change-Id: I138a9aa0bb156982b6c7656c51a1e2194776e4ed
 2014-07-30 21:17:06 +00:00
Sean Wan
5ce8efc46a am b4a0e3ef: Merge "Fixed a NullPointerException in AccountManagerService." into lmp-dev 
* commit 'b4a0e3efc8dc5b26cbc2476c67b052914a2970bf':
  Fixed a NullPointerException in AccountManagerService.
 2014-07-30 21:16:54 +00:00
Robert Ly
317ffe91a6 am a5e5d455: Merge "resolved conflicts for merge of 60e7f541 to lmp-dev" into lmp-dev 
* commit 'a5e5d455c6cb605fd289a9147b80adf0a955addb':
  docs: Revised page to include info about new Publisher API.
 2014-07-30 21:16:49 +00:00
Martijn Coenen
8330103ccf am e5996ff4: Merge "Make some NFC APIs @systemAPI." into lmp-dev 
* commit 'e5996ff428d5adb5d523878d67db347b1676b3bc':
  Make some NFC APIs @systemAPI.
 2014-07-30 21:16:45 +00:00
Raph Levien
8dbb94a899 am c4445abb: Merge "Bump refcount of canvas created for Picture" into lmp-dev 
* commit 'c4445abba696f199eca2ad9943b51e84d016d494':
  Bump refcount of canvas created for Picture
 2014-07-30 21:16:41 +00:00
Joe Fernandez
9386003cb9 am a3e52154: am ecf76d1c: am b83127f0: Merge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ" into klp-modular-docs 
* commit 'a3e521540b1143264033ca217d11b90ec20e6c54':
  docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ
 2014-07-30 21:14:39 +00:00
Alan Lau
d38347ec51 am 40274ada: (-s ours) am b12318be: Merge "Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""" into klp-modular-dev 
* commit '40274ada4a8699a18836c369ca26ebb837ca37f2':
  Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""
 2014-07-30 21:14:33 +00:00