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

147088 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Behdad Esfahbod
6dea9bec3f am 8bbd753a: Support FontFeatureSettings in Paint 
* commit '8bbd753a20cc3fdcc4e92fb99e807b5a69cae6b2':
  Support FontFeatureSettings in Paint
 2014-07-30 21:42:22 +00:00
Andres Morales
d8cd23fb6a am 0de25904: am bdb80096: Merge "Revert "NFC Unlock api changes"" into lmp-dev 
* commit '0de25904c41a47f6e233bc0ee9fa2264e6d9bf92':
  Revert "NFC Unlock api changes"
 2014-07-30 21:41:56 +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
7d36e7be8b am 28affba6: am 077daef9: Merge "Update switch assets, fix SearchView asset 9-patch areas" into lmp-dev 
* commit '28affba60ec851f950b308d72d1e1c6a89a703bd':
  Update switch assets, fix SearchView asset 9-patch areas
 2014-07-30 21:30:35 +00:00
keunyoung
a627c3886f am 669f8f22: am 4d2751c5: Merge "add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode" into lmp-dev 
* commit '669f8f22c9e1b88e151c293300345164e8dfc012':
  add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode
 2014-07-30 21:30:31 +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
f1ed4bf47f am 6b53a8a7: am 9fef5fbc: NFC Unlock api changes 
* commit '6b53a8a7f7fb1bb01b4d11219d8210072d77146e':
  NFC Unlock api changes
 2014-07-30 21:26:13 +00:00
Joe Fernandez
4aadeb8e61 am 69d33398: 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 '69d33398402d565cb1a30bbecc10f23849583b87':
  docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ
 2014-07-30 21:26:09 +00:00
Alan Lau
5b5ec39c26 am b1d2ce67: 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 'b1d2ce67d2f951fb62a138342abe0138e1267dee':
  Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""
 2014-07-30 21:26:05 +00:00
Alan Lau
08217beefa am 0109c7a3: am 1e438bef: am 839ca0d5: (-s ours) am 06a84554: Merge "Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""" into klp-modular-dev 
* commit '0109c7a329da4a478d212d58e131d8dc7ff16498':
  Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""
 2014-07-30 21:26:02 +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