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

147460 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Craig Mautner
f7b1b59adf am 88f6749d: resolved conflicts for merge of 5c4b5ede to lmp-dev-plus-aosp 
* commit '88f6749d264ac28326e385f69bca918423ebc4a8':
  [ActivityManager] Prevent coredump file may not complete for testing.
 2014-07-31 12:51:47 +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
Primiano Tucci
a0cdfe137b Cleanup debug messages in WebViewFactory and WebViewUpdateService 
This is just a cleanup CL which fixes:
- Some erroneous debug messages about the relro creator process.
- The condition checked in WebViewUpdateService, to prevent the
  WebView to be used from the SystemServer (it now looks at the
  process id, previously it was erroneously looking at the uid).
- Adds a 5s. timeout to the waitForRelroCreationCompleted.

BUG:16403706

Change-Id: I43a953949050d7df5fe334cfa7257315ee6db071
 2014-07-31 12:53:34 +01: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
Primiano Tucci
a29461cd31 Move startIsolatedProcess implementation in ActivityManagerService 
This CL addresses the comments in CL 512432, moving the implementation
of startIsolatedProcess in the outer ActivityManagerService class and
making the entry point in the ActivityManagerInternal sublcass just
a proxy method.
This change also addresses a potential NPE, due to startProcessLocked
returning null in some failure cases.

BUG:16403706
Change-Id: I21eff88c23221653f552cfc171647a839e42a802
 2014-07-31 08:56:51 +00:00
Bernhard Bauer
8989964ee3 Add a method to DevicePolicyManager to silently install a certificate / private key pair. 
BUG=15065444

Change-Id: Id3d255e1fce2c608501c3a038633a93c7f191426
 2014-07-31 09:30:13 +01: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
8a114fffca am a400ea8d: am f37034ac: am 905fe15e: Merge "[ActivityManager] Avoid mistaking visibility by finishing task." 
* commit 'a400ea8d936b6cfb1df7c9811e22e255a14fb229':
  [ActivityManager] Avoid mistaking visibility by finishing task.
 2014-07-31 04:07:00 +00: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
87dffdd02b am 9200a867: am 6f088df9: am 44551060: Allow using third-party HTTP/... stacks for per-network URLs. 
* commit '9200a867a71b02c0147b0a9670f1e141d398aa43':
  Allow using third-party HTTP/... stacks for per-network URLs.
 2014-07-31 03:11:12 +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
George Mount
cad10680b7 Merge "Fix visibility propagation check." into lmp-dev 2014-07-30 23:34:26 +00:00
George Mount
6ceac2eafb Fix visibility propagation check. 
Bug 16704963

Change-Id: I2538bac4b4565ac8c6b27407c7679fea55b1092b
 2014-07-31 17:05:37 +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
Selim Gurun
70df291917 Merge "Find WebView package name from a config resource." 2014-07-30 23:34:26 +00:00
Yuncheol Heo
a2964df6b7 am a237f996: am 824dd785: am 63674ed0: Don\'t clear local device when it goes to the standby mode. 
* commit 'a237f996fa1eb5ae9a7c484d3cf77126583d80ac':
  Don't clear local device when it goes to the standby mode.
 2014-07-31 01:46:10 +00:00
Torne (Richard Coles)
a53b0e6c05 Find WebView package name from a config resource. 
Use a config resource to determine the package name for the WebView
implementation to allow it to be changed by a resource overlay.

Bug: 16329371
Change-Id: I5977691c0223347e0382d584c3d3ee4428660180
 2014-07-30 18:46:04 -07:00
Shishir Agrawal
81f10dbd01 am b169a41e: am 1d678b52: am 20832529: Merge "Add new APIs iccExchangeSimIO and iccTransmitApduBasicChannel to TelephonyManager." into lmp-dev 
* commit 'b169a41e409ee6e62dc3c9403fd5a7129f921a23':
  Add new APIs iccExchangeSimIO and iccTransmitApduBasicChannel to TelephonyManager.
 2014-07-31 01:22:35 +00:00
Andres Morales
8de157275c am 789b2b55: am 9884a1ac: am 3df55fc3: NFC Unlock api changes 
* commit '789b2b5558aaa379f00ec81496cbb29f00ee47fc':
  NFC Unlock api changes
 2014-07-31 01:22:31 +00:00
Roozbeh Pournader
ff7a86c16f Re-remove AndroidEmoji.ttf. 
It was mistakenly re-added in 6feb729b686b902be2520a91281e1a000c055da2.

Change-Id: I99a41ed8e6f1975e9808d8063e594fbb996d4334
 2014-07-30 17:20:36 -07:00
destradaa
d2cf9d98da am f4fdceb1: am b46316dd: am 823ac05c: Add support for sources in Geofencing APIs. 
* commit 'f4fdceb117ebdc41c2937da86a751936c0f8c21a':
  Add support for sources in Geofencing APIs.
 2014-07-30 23:51:17 +00:00
Ruben Brunk
3c9e3c8211 am 49848592: am 6946415f: am e95f2a0e: camera2: Implement request templates for LEGACY. 
* commit '4984859292319f2f2ac42ea745012215e5bea84f':
  camera2: Implement request templates for LEGACY.
 2014-07-30 23:27:35 +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
291abc24f7 am de3094fd: am 89ad0a89: am 2705fc25: Adds toString() in MediaBrowserItem 
* commit 'de3094fd608e508cdd7026885ba94236da65ae57':
  Adds toString() in MediaBrowserItem
 2014-07-30 22:56:30 +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