Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
170,616 Commits 3 Branches 0 Tags
548108d3f334e7db8ea44acb9876d4f2b82b2459
Commit Graph

170616 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Santos Cordon
548108d3f3 am a567b68b: am 3126b3e4: am ccbc3e5c: Merge "Update javadocs for Telecom APIs." into lmp-mr1-dev 
* commit 'a567b68bbec5e60c65019ca0136e6b9a11c0cb88':
  Update javadocs for Telecom APIs.
 2014-10-30 10:26:30 +00:00
Jeff Davidson
863fbacd14 am ab3e142b: am 306eac5f: am f82b029c: Merge "Check UID instead of package name when preparing VPN." into lmp-mr1-dev 
* commit 'ab3e142b302eef822d8daa7d4bf57994aad1a290':
  Check UID instead of package name when preparing VPN.
 2014-10-30 10:26:23 +00:00
Joe Fernandez
01088a84d0 am b51bd437: am 296e0a79: am 9513604c: am 5c0ed74b: am 40bf63e0: Merge "docs: Update timing of Android Wear app review" into lmp-docs automerge: 56a8cb7 
* commit 'b51bd437c2368c41b7ccf2b7ff96543e54162681':
  docs: Update timing of Android Wear app review
 2014-10-30 10:26:18 +00:00
David Friedman
744d5006d1 am 2a2200c6: am 387675d9: am 79c332a6: am b2d582d9: am 3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs automerge: b648cab 
* commit '2a2200c63c54ea627f2bc320f7dd06a92bc9cd1b':
  Updates Notifications screenshot for Android 5.0.
 2014-10-30 10:26:14 +00:00
Eric Gilmore
dfcc0c682e am ba6abdf8: am 7e99cedb: am 3fc61015: am 9a6aa0ff: am d126294a: Docs: Adding Android Studio instructions for adding IAB service. automerge: 77760e7 
* commit 'ba6abdf841bd475e08e53a5008dd614a7943bfac':
  Docs: Adding Android Studio instructions for adding IAB service.
 2014-10-30 10:26:10 +00:00
Sebastien Hertz
c276b6189e am 837b140c: resolved conflicts for merge of f44baef1 to lmp-mr1-dev-plus-aosp 
* commit '837b140c825c9f7342483ea9f39d4f872bcb2e3c':
  cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
 2014-10-30 10:21:12 +00:00
Santos Cordon
a567b68bbe am 3126b3e4: am ccbc3e5c: Merge "Update javadocs for Telecom APIs." into lmp-mr1-dev 
* commit '3126b3e4835df82e54bf57b6e30a20c6922b0b81':
  Update javadocs for Telecom APIs.
 2014-10-30 10:18:18 +00:00
Jeff Davidson
ab3e142b30 am 306eac5f: am f82b029c: Merge "Check UID instead of package name when preparing VPN." into lmp-mr1-dev 
* commit '306eac5f41de151a1be6832f6629113eef0b10e4':
  Check UID instead of package name when preparing VPN.
 2014-10-30 10:18:12 +00:00
Joe Fernandez
b51bd437c2 am 296e0a79: am 9513604c: am 5c0ed74b: am 40bf63e0: Merge "docs: Update timing of Android Wear app review" into lmp-docs automerge: 56a8cb7 
* commit '296e0a79b988a5eb601ab60419b810d031fdf20b':
  docs: Update timing of Android Wear app review
 2014-10-30 10:18:05 +00:00
David Friedman
2a2200c63c am 387675d9: am 79c332a6: am b2d582d9: am 3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs automerge: b648cab 
* commit '387675d9050e699de4d976cfe78faec389673cb1':
  Updates Notifications screenshot for Android 5.0.
 2014-10-30 10:17:59 +00:00
Eric Gilmore
ba6abdf841 am 7e99cedb: am 3fc61015: am 9a6aa0ff: am d126294a: Docs: Adding Android Studio instructions for adding IAB service. automerge: 77760e7 
* commit '7e99cedb50bc0712cc879852e16793cfeeb0d85a':
  Docs: Adding Android Studio instructions for adding IAB service.
 2014-10-30 10:17:52 +00:00
Sebastien Hertz
837b140c82 resolved conflicts for merge of f44baef1 to lmp-mr1-dev-plus-aosp 
Change-Id: I754fa19727d0c1db7ca2110b7cae51c9f7c15e00
 2014-10-30 11:06:41 +01:00
Elliott Hughes
8caccd4cb9 am b6e00426: am c8dce896: Merge "Fix not to show a log with empty default ime" 
automerge: 1b9813a

* commit '1b9813ad0bed9435fa4ec1631ddffc9ad5190d5f':
  Fix not to show a log with empty default ime
 2014-10-30 03:53:24 +00:00
Elliott Hughes
1b9813ad0b am b6e00426: am c8dce896: Merge "Fix not to show a log with empty default ime" 
* commit 'b6e004261cc5c1b9b9ab338ce30896f537182336':
  Fix not to show a log with empty default ime
 2014-10-30 03:19:32 +00:00
Elliott Hughes
b6e004261c am c8dce896: Merge "Fix not to show a log with empty default ime" 
* commit 'c8dce8966b84203befb87a24a9d2d8ee87a39f7b':
  Fix not to show a log with empty default ime
 2014-10-30 03:06:12 +00:00
Elliott Hughes
c8dce8966b Merge "Fix not to show a log with empty default ime" 2014-10-30 03:02:01 +00:00
Hyejin Kim
e6ef68b15a Fix not to show a log with empty default ime 
It'll make reboot to show a log with empty defualt ime.

Bug: 18165757
Change-Id: Ieec2532cbe003cb6307a70748a2f6c8987708eae
 2014-10-30 09:22:17 +09:00
Vladimir Marko
4e9176e6d5 am d9e8b73f: am 548101cb: am e5fe7f3f: Merge "Fix android_media_AudioSystem_getMasterMute return type." 
* commit 'd9e8b73fd03b2c1eda7c0cb195b39c6290de61ad':
  Fix android_media_AudioSystem_getMasterMute return type.
 2014-10-29 22:07:32 +00:00
Vladimir Marko
d9e8b73fd0 am 548101cb: am e5fe7f3f: Merge "Fix android_media_AudioSystem_getMasterMute return type." 
* commit '548101cb96fbc855d4257d46841b2959fe4c9ce4':
  Fix android_media_AudioSystem_getMasterMute return type.
 2014-10-29 22:03:18 +00:00
Vladimir Marko
548101cb96 am e5fe7f3f: Merge "Fix android_media_AudioSystem_getMasterMute return type." 
* commit 'e5fe7f3f4069b176a0465617dceb630a52b710c0':
  Fix android_media_AudioSystem_getMasterMute return type.
 2014-10-29 21:57:16 +00:00
Vladimir Marko
e5fe7f3f40 Merge "Fix android_media_AudioSystem_getMasterMute return type." 2014-10-29 21:52:02 +00:00
Vladimir Marko
b4b5518c81 Fix android_media_AudioSystem_getMasterMute return type. 
Caused FPU stack overflow on x86.

Bug: 18023418

(cherry picked from commit c1bcdbb758)

Change-Id: Ia1b5a1da52b20c2e0a84321e784cd795ec649e66
 2014-10-29 21:18:00 +00:00
Calin Juravle
be312e43ab am bd705e5e: am 5d5e4b14: am 43a92646: Merge "Use native brige only if we have a private data directory." 
* commit 'bd705e5ed1906332a66b12b1b64acbe44da869f0':
  Use native brige only if we have a private data directory.
 2014-10-29 20:47:57 +00:00
Calin Juravle
bd705e5ed1 am 5d5e4b14: am 43a92646: Merge "Use native brige only if we have a private data directory." 
* commit '5d5e4b14f67903370a7805492eb92fbe3b487a14':
  Use native brige only if we have a private data directory.
 2014-10-29 20:41:55 +00:00
Narayan Kamath
fd79e9f3c3 am 3cad510e: am 4ed472ab: resolved conflicts for merge of 3028394c to stage-aosp-master 
* commit '3cad510e271d4e9510d0f15560c4979071c8436c':
  Suppress Clang compilation warnings.
 2014-10-29 19:42:18 +00:00
Narayan Kamath
f0c7066742 am 78b3f5ab: am fa945c10: am e87d36f8: Merge "Revert "Remove unused apache related API."" 
* commit '78b3f5ab70300548776e3b98ee6d8fb6b1f5318f':
  Revert "Remove unused apache related API."
 2014-10-29 19:42:13 +00:00
Elliott Hughes
99e08b70aa am b5ce284a: resolved conflicts for merge of d3389e2f to lmp-mr1-dev-plus-aosp 
* commit 'b5ce284aa8e738de051572ab37a01d52fa7b1dac':
  Remove unused apache related API.
 2014-10-29 19:38:05 +00:00
Narayan Kamath
3cad510e27 am 4ed472ab: resolved conflicts for merge of 3028394c to stage-aosp-master 
* commit '4ed472ab33e78391c0b084ed3908019e06b7dfe5':
  Suppress Clang compilation warnings.
 2014-10-29 19:34:32 +00:00
Narayan Kamath
78b3f5ab70 am fa945c10: am e87d36f8: Merge "Revert "Remove unused apache related API."" 
* commit 'fa945c105b4f7bb3e3844e8ce467ca701d5f3a9f':
  Revert "Remove unused apache related API."
 2014-10-29 19:34:10 +00:00
Elliott Hughes
b5ce284aa8 resolved conflicts for merge of d3389e2f to lmp-mr1-dev-plus-aosp 
Change-Id: Ic4969a59ef22d4911f74cc1e75ea5ccfab59b770
 2014-10-29 12:31:48 -07:00
Narayan Kamath
99562bf065 am 7192f0d2: am b27ea563: am 00fd3639: Merge "Remove tests/SslLoad." 
* commit '7192f0d2acafb2599988d463a42a2dcfd80c25bc':
  Remove tests/SslLoad.
 2014-10-29 17:56:07 +00:00
Andreas Gampe
174ac568cb am 955bee89: am dfdc6acc: resolved conflicts for merge of 3c8cf51f into stage-aosp-master 
* commit '955bee89abada8b6541f499c686376d4434242b1':
  Stop using apache http to download Gps XTRA data.
 2014-10-29 17:56:03 +00:00
Calin Juravle
e41c4f2cbb am 263829e0: am 5d4deb82: am f7d24d24: Merge "PreInitializeNativeBridge only if its Available" 
* commit '263829e0e794f48335db2f49078c53fe10292e98':
  PreInitializeNativeBridge only if its Available
 2014-10-29 17:55:58 +00:00
Narayan Kamath
7192f0d2ac am b27ea563: am 00fd3639: Merge "Remove tests/SslLoad." 
* commit 'b27ea56312692c5ee0f38dad38e2a3832086b40a':
  Remove tests/SslLoad.
 2014-10-29 17:47:15 +00:00
Andreas Gampe
955bee89ab am dfdc6acc: resolved conflicts for merge of 3c8cf51f into stage-aosp-master 
* commit 'dfdc6acc4809f395b9db2136acc89b6de932a1a5':
  Stop using apache http to download Gps XTRA data.
 2014-10-29 17:47:10 +00:00
Calin Juravle
263829e0e7 am 5d4deb82: am f7d24d24: Merge "PreInitializeNativeBridge only if its Available" 
* commit '5d4deb8246b13531a6b2b7611c650ba504e44dc6':
  PreInitializeNativeBridge only if its Available
 2014-10-29 17:47:03 +00:00
Elliott Hughes
7070b1a8d0 am 64a1a901: am 87ce99ca: am ced7ebdb: Merge "Migrate off timeFormat12 and timeFormat24." 
* commit '64a1a901dcd9b3103cc63d5c20de9af6db9d1ada':
  Migrate off timeFormat12 and timeFormat24.
 2014-10-29 17:37:29 +00:00
Craig Mautner
0a6b5bbd15 am 177f91d1: am 9d9aac4c: resolved conflicts for merge of 2bf3800b to stage-aosp-master 
* commit '177f91d1ede0cef9fc6c7c29f163b78467c49f8c':
  Doesn't re-sort app windows when move task to top
 2014-10-29 17:37:25 +00:00
Geoff Mendal
a8b0e39d8d Merge "Import translations. DO NOT MERGE" 2014-10-29 17:24:48 +00:00
Elliott Hughes
64a1a901dc am 87ce99ca: am ced7ebdb: Merge "Migrate off timeFormat12 and timeFormat24." 
* commit '87ce99ca7243e4556a6cfe9f42cc51531301e979':
  Migrate off timeFormat12 and timeFormat24.
 2014-10-29 17:13:38 +00:00
Craig Mautner
177f91d1ed am 9d9aac4c: resolved conflicts for merge of 2bf3800b to stage-aosp-master 
* commit '9d9aac4cacce75b4847aebce0f019250dc3b4e93':
  Doesn't re-sort app windows when move task to top
 2014-10-29 17:11:12 +00:00
Geoff Mendal
2ab65ff448 Import translations. DO NOT MERGE 
Change-Id: I8f1bf8edcb728903664ca201fbf1ed6e7e31e9eb
Auto-generated-cl: translation import
 2014-10-29 08:51:47 -07:00
Geoff Mendal
cd389a9d54 Import translations. DO NOT MERGE 
Change-Id: I17b773669aa4ad49ae2a510d7ed96f98e2087f00
Auto-generated-cl: translation import
 2014-10-29 08:20:19 -07:00
Calin Juravle
5d5e4b14f6 am 43a92646: Merge "Use native brige only if we have a private data directory." 
* commit '43a9264619e08f464dd4f184e53441a440cca09f':
  Use native brige only if we have a private data directory.
 2014-10-29 13:21:09 +00:00
Calin Juravle
43a9264619 Merge "Use native brige only if we have a private data directory." 2014-10-29 13:15:49 +00:00
Calin Juravle
6a4d2369e5 Use native brige only if we have a private data directory. 
Bug: 18027433

Change-Id: I59b1b1cbe1d7d14b93d8bb6d4255c951d9e469b6
 2014-10-29 12:40:03 +00:00
Narayan Kamath
4ed472ab33 resolved conflicts for merge of 3028394c to stage-aosp-master 
Change-Id: I980e4c95cdc6a4778cef3298338692656d23e7c6
 2014-10-29 12:12:37 +00:00
Narayan Kamath
fa945c105b am e87d36f8: Merge "Revert "Remove unused apache related API."" 
* commit 'e87d36f8925a34f85ba80c886757d07ad03fed42':
  Revert "Remove unused apache related API."
 2014-10-29 11:30:11 +00:00
Narayan Kamath
d3389e2f32 resolved conflicts for merge of 9834af9c to stage-aosp-master 
Change-Id: Ibdada14406f49684cf345162204b9810452f25a2
 2014-10-29 11:23:45 +00:00
Narayan Kamath
b27ea56312 am 00fd3639: Merge "Remove tests/SslLoad." 
* commit '00fd36399fd8dd9566b582c24817d130982bc270':
  Remove tests/SslLoad.
 2014-10-29 05:47:26 +00:00