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

119088 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
5a5cb78bf0 am 790c5a4c: am 29de5063: Merge "fix some typos for GoogleApiClient doc" into klp-docs 
* commit '790c5a4c06e0ceee8fbdbed575e93ef257124569':
  fix some typos for GoogleApiClient doc
 2014-03-10 16:26:54 +00:00
Scott Main
c0eb623c10 am 7b0c111b: am 69e49a81: Merge "fix typos" into klp-docs 
* commit '7b0c111b5f3595de5cac61b0657a6f2ecb7e77bd':
  fix typos
 2014-03-10 16:26:50 +00:00
Scott Main
790c5a4c06 am 29de5063: Merge "fix some typos for GoogleApiClient doc" into klp-docs 
* commit '29de50633348fb6329ed38980abce0010253a941':
  fix some typos for GoogleApiClient doc
 2014-03-10 16:24:29 +00:00
Scott Main
7b0c111b5f am 69e49a81: Merge "fix typos" into klp-docs 
* commit '69e49a819a5fd3a9d0ede1ba18f204e5e2050da6':
  fix typos
 2014-03-10 16:24:26 +00:00
Scott Main
29de506333 Merge "fix some typos for GoogleApiClient doc" into klp-docs 2014-03-10 16:21:10 +00:00
Scott Main
69e49a819a Merge "fix typos" into klp-docs 2014-03-10 16:20:45 +00:00
Wei Wang
31b5dfbc11 am 0ea81eed: am 1327e59f: Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into klp-dev 
* commit '0ea81eed882d288c9473e377639b0b88280fd044':
  DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API.
 2014-03-08 06:25:06 +00:00
Adam Powell
d33dd01420 am 96192157: am f175b19a: Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-dev 
* commit '96192157b88d3630827a9ffd55693866734b4da3':
  Fix a bug where OnTouchListeners in action views could be removed
 2014-03-08 06:23:47 +00:00
Marco Nelissen
85941d6633 am f41efb44: am 57a45f22: Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." into klp-dev 
* commit 'f41efb446a40f0904f3788c2a773f2a700b1342a':
  Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
 2014-03-08 06:23:44 +00:00
Craig Mautner
8c9606914d am 9bf7f893: am 93df07a1: Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev 
* commit '9bf7f893e0833fca9b240c11b98d6d7dc1892081':
  Show the keyguard if unsecure window on top. DO NOT MERGE.
 2014-03-08 06:23:41 +00:00
Marco Nelissen
efae1ff25d am ac875878: am 9823a170: Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev 
* commit 'ac87587875f1dfade5e06a82ccc009d0f0170569':
  Make MtpDatabase use libexif instead of libjhead
 2014-03-08 06:22:44 +00:00
Vineeta Srivastava
9b07e7cc5f am f066adde: am dbeb0c12: Merge "telephony: Add same named operator configuration for some operators" into klp-dev 
* commit 'f066adde7a3722deba0226715af695537511271e':
  telephony: Add same named operator configuration for some operators
 2014-03-08 06:22:28 +00:00
Wei Wang
0ea81eed88 am 1327e59f: Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into klp-dev 
* commit '1327e59f36ceea5a1ee7dc66b311206345353de5':
  DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API.
 2014-03-08 02:05:57 +00:00
Wei Wang
1327e59f36 Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into klp-dev 2014-03-08 02:01:02 +00:00
Elliott Hughes
6a4faf1c72 am b2f07b27: am 4a809272: Merge "Fix documentation for Parcel.readException()." 
* commit 'b2f07b27725bed9716114c46df2cf636eb366f6f':
  Fix documentation for Parcel.readException().
 2014-03-08 01:51:55 +00:00
Elliott Hughes
be59a21164 am 29d60b95: am 8d41e653: Merge "Miscellaneous small documentation fixes." 
* commit '29d60b95fa8019c0542f46551057c4d376bb8a7a':
  Miscellaneous small documentation fixes.
 2014-03-08 01:51:52 +00:00
Narayan Kamath
6c18e8adf2 am 911b2ce3: am 4a642ee5: Merge "Remove unused JNITest class" 
* commit '911b2ce3da7dbd8b6335d1092fc6c9e880147104':
  Remove unused JNITest class
 2014-03-08 01:51:43 +00:00
Narayan Kamath
126fbb6ec9 am 19256340: am 22c66639: Merge "Fixes for 64bit in libhwui" 
* commit '192563407964926537d688d4098054c3834341c0':
  Fixes for 64bit in libhwui
 2014-03-08 01:51:21 +00:00
Adam Powell
96192157b8 am f175b19a: Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-dev 
* commit 'f175b19aaac7ffe5553013d996a073693cac929d':
  Fix a bug where OnTouchListeners in action views could be removed
 2014-03-07 23:38:30 +00:00
Marco Nelissen
f41efb446a am 57a45f22: Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." into klp-dev 
* commit '57a45f22ea7b0509fb918fa39e797a6061f75438':
  Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
 2014-03-07 23:38:27 +00:00
Craig Mautner
9bf7f893e0 am 93df07a1: Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev 
* commit '93df07a1b72488b64354098cd00dff1d36b76b12':
  Show the keyguard if unsecure window on top. DO NOT MERGE.
 2014-03-07 23:38:20 +00:00
Adam Powell
f175b19aaa Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-dev 2014-03-07 23:28:19 +00:00
Marco Nelissen
57a45f22ea Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." into klp-dev 2014-03-07 22:49:33 +00:00
Craig Mautner
93df07a1b7 Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev 2014-03-07 22:30:26 +00:00
Elliott Hughes
0bb17193cc Fix a JNI local reference leak in JNIMediaPlayerListener::notify. 
Bug: https://code.google.com/p/android/issues/detail?id=62137
b/12603577
Change-Id: I776cd83a66de37fdbbe8af367bf1b26e5e0c7247
 2014-03-07 14:10:52 -08:00
Marco Nelissen
ac87587875 am 9823a170: Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev 
* commit '9823a170e4f9ff1d9233eb7eb661c4d418c2e2a7':
  Make MtpDatabase use libexif instead of libjhead
 2014-03-07 21:12:21 +00:00
Vineeta Srivastava
f066adde7a am dbeb0c12: Merge "telephony: Add same named operator configuration for some operators" into klp-dev 
* commit 'dbeb0c12950e92a59671f8da7952ddf3486789b4':
  telephony: Add same named operator configuration for some operators
 2014-03-07 21:12:17 +00:00
Marco Nelissen
9823a170e4 Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev 2014-03-07 20:23:29 +00:00
Vineeta Srivastava
dbeb0c1295 Merge "telephony: Add same named operator configuration for some operators" into klp-dev 2014-03-07 20:09:00 +00:00
Narayan Kamath
b2235d5db7 am fca204a4: am 05cebdc2: Merge "Fix several bad function definitions." 
* commit 'fca204a4b8771b800383c91465a48eb2cd8b3ba2':
  Fix several bad function definitions.
 2014-03-07 19:41:27 +00:00
Narayan Kamath
cde7868356 am b152473f: am 9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit compatible" 
* commit 'b152473f46d8176e7eb2c55b54342a7a29c525cf':
  AArch64: Make AssetAtlasService 64-bit compatible
 2014-03-07 19:41:24 +00:00
Narayan Kamath
75e20ed78c am 128599e4: am 2b3c14bf: Merge "libandroidfw: fix build error for 64-bit" 
* commit '128599e4496bd7ceb9d70f4addde0eba65103709':
  libandroidfw: fix build error for 64-bit
 2014-03-07 19:41:21 +00:00
Craig Mautner
81f6bccae1 am 23ef1b5e: am 16ea3e6a: Merge "A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one." 
* commit '23ef1b5e0b84e3bb726454b97846f91f2efad212':
  A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one.
 2014-03-07 19:40:33 +00:00
Narayan Kamath
ae69111e23 am 96ddea41: am 7c710936: Merge "Remove java.io.tmpdir assignment in AndroidRuntime." 
* commit '96ddea413dcf266d996877d3fc2d81738c5316c8':
  Remove java.io.tmpdir assignment in AndroidRuntime.
 2014-03-07 19:40:30 +00:00
Calin Juravle
801b3542c7 am 7a4172d1: am f11cc165: Merge "Fixed a possible infinite loop in JsonReader#skipValue()" 
* commit '7a4172d190871c6b17124bf86374304cef727984':
  Fixed a possible infinite loop in JsonReader#skipValue()
 2014-03-07 19:40:23 +00:00
Jeff Sharkey
a8e39c76a6 am 660a514e: am 60097a9c: Merge "Structure device not freed in error case" 
* commit '660a514e80e0019d8c6632e84bd03491722fc2ab':
  Structure device not freed in error case
 2014-03-07 19:39:52 +00:00
Jeff Sharkey
6101c3c8f3 am df47ecaa: am 02a64dae: Merge "Tethering: Skip link local addresses when enabling NAT" 
* commit 'df47ecaa0973b80c9b97ef9ed3ad7abcfef361c7':
  Tethering: Skip link local addresses when enabling NAT
 2014-03-07 19:39:49 +00:00
Jeff Sharkey
3f81ee6f54 am e6d256c5: am 234b0b03: Merge "Fix, MountService now only sends one onShutDownComplete" 
* commit 'e6d256c50b0709378a5bfff0ae27eb7cf6cc3894':
  Fix, MountService now only sends one onShutDownComplete
 2014-03-07 19:39:45 +00:00
Narayan Kamath
c73480ef68 am 92a09fbd: am a14d9c31: Merge "Move Json{Reader,Writer} test to cts." 
* commit '92a09fbdebae5362633db281bc155ed1f1145588':
  Move Json{Reader,Writer} test to cts.
 2014-03-07 19:39:35 +00:00
Narayan Kamath
d5b9bcb60d am 28879bbf: am be57fca4: Merge "Extended locales in AAPT / AssetManager." 
* commit '28879bbfe89dc4bf2067a7183975ecffb82f68e6':
  Extended locales in AAPT / AssetManager.
 2014-03-07 19:39:13 +00:00
Narayan Kamath
f214b4cccb am 183e5e03: am 49024bac: Merge "AssetManager support for 3 letter lang/country codes." 
* commit '183e5e038bd844ac415b14f22df5c476732066c8':
  AssetManager support for 3 letter lang/country codes.
 2014-03-07 19:39:09 +00:00
Tim Murray
8829fc06ca am 4870c813: am 7d1a6c5c: Merge "Fix destruction issues relating to AllocationAdapter." 
* commit '4870c813fe4a6fc7a176f22b5e7f96e9f7a4e469':
  Fix destruction issues relating to AllocationAdapter.
 2014-03-07 19:38:48 +00:00
Ben Gruver
24ad70598e am da379447: am 509a243c: Merge "Check the return value of listFiles on the ifw directory" 
* commit 'da37944785c47b2b92c1a0f79c5d602256859fe6':
  Check the return value of listFiles on the ifw directory
 2014-03-07 19:38:42 +00:00
Tim Murray
d8b0c65717 am b25a6936: am d7043f00: Merge "Add hidden minor version ID for support lib workarounds." 
* commit 'b25a6936a1b0dbabaf8ad8c2ce59e7251daa9e8c':
  Add hidden minor version ID for support lib workarounds.
 2014-03-07 19:38:35 +00:00
Narayan Kamath
d556b42909 am 3bec0fbb: am fa8f95e9: Merge "AArch64: Use long for pointers in SurfaceSession class" 
* commit '3bec0fbb349a969934828ee726956877a3a21dee':
  AArch64: Use long for pointers in SurfaceSession class
 2014-03-07 19:34:28 +00:00
Dianne Hackborn
8392e7e287 am 01de2432: am 24d8fa73: Merge "frameworks/base: move idmap from frameworks/native" 
* commit '01de243263d347f2ac13a239d67d41817e34df33':
  frameworks/base: move idmap from frameworks/native
 2014-03-07 19:33:55 +00:00
Wink Saville
a6f527b941 am ea56c795: am bbba8211: Merge "Telephony: Handle DATA_CALL_LIST in DCC." 
* commit 'ea56c795b0b4997f5835ec42a18eccdb173bc468':
  Telephony: Handle DATA_CALL_LIST in DCC.
 2014-03-07 19:33:42 +00:00
Sungmin Choi
5d37e0d1b4 telephony: Add same named operator configuration for some operators 
Add same named operator configuration for 404, 405, and 520.
That is, show roaming icon though same named operators.

Bug: 12121959
Change-Id: I9148bab727170f670fd2679db69b123b0526bb32
 2014-03-07 11:29:18 -08:00
Vineeta Srivastava
7e4bf2b06e Merge commit '3d924f1e' into manualmerge 2014-03-07 11:07:20 -08:00
Vineeta Srivastava
3d924f1e8d am ef86ff58: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev 
* commit 'ef86ff58178e876f1dfbedd65166cc806f006ba8':
  Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]
 2014-03-07 18:40:53 +00:00