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

114608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Christie
b3c96c4c57 am 1d151607: am 4013c4b1: am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge 
* commit '1d151607fbee65fc9fc2bb1cb38a850c1f68bede':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 12:50:18 -08:00
David Christie
1d151607fb am 4013c4b1: am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge 
* commit '4013c4b18ccc66b510f4cdb222d4c04597975843':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 12:46:35 -08:00
David Christie
4013c4b18c am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge 
* commit '42d7a0bff5da6aeb8323ae0c797e9c4e116b637b':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 12:43:47 -08:00
David Christie
42d7a0bff5 am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge 
* commit 'a7d13fabd6184e411215e9a841cf16097f1a5127':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 12:41:48 -08:00
David Christie
a7d13fabd6 am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge 
* commit '45aaa377c5d090003c6cf5fb54fff856a0807c4f':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 12:40:04 -08:00
David Christie
45aaa377c5 am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge 
* commit 'a1b89310d58df14570f7f6f5abb677c976c63a7a':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 12:36:49 -08:00
David Christie
a1b89310d5 am a87bdc1f: Merge commit \'bc39746e\' into manualmerge 
* commit 'a87bdc1f8ff308f90ec7a3234c4848c79d4c3988':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 12:33:39 -08:00
Daniel Cashman
af2f2f767a am 9ecadd7c: am 6f34b938: am 3238d0d9: Merge "Clear cached locations when location providers disabled Bug: 12118307" into jb-mr2-dev 
* commit '9ecadd7cedc492faef163a314713caddbd5da39a':
  Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 10:56:41 -08:00
Daniel Cashman
9ecadd7ced am 6f34b938: am 3238d0d9: Merge "Clear cached locations when location providers disabled Bug: 12118307" into jb-mr2-dev 
* commit '6f34b9382f0dac64952e0e5c05e96ea2ef3e28e8':
  Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 10:53:31 -08:00
Daniel Cashman
6f34b9382f am 3238d0d9: Merge "Clear cached locations when location providers disabled Bug: 12118307" into jb-mr2-dev 
* commit '3238d0d9f98d4d0972e52a81a4e9b8d2aea0436d':
  Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 10:50:03 -08:00
Daniel Cashman
3238d0d9f9 Merge "Clear cached locations when location providers disabled Bug: 12118307" into jb-mr2-dev 2014-01-13 18:44:45 +00:00
Daniel Cashman
4503409a47 Merge "Clear cached locations when location providers disabled Bug: 12118307" into klp-dev 2014-01-13 18:44:38 +00:00
David Christie
a4bd593155 am c454bbe8: (-s ours) am b15429a6: am 503c5a32: am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit 'c454bbe805bd6ed096ec6b4b811c4e4b67a86225':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 13:27:26 -08:00
David Christie
c454bbe805 am b15429a6: am 503c5a32: am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit 'b15429a6853472207c2a4aefd22dd009e851edb7':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 13:24:05 -08:00
David Christie
b15429a685 am 503c5a32: am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit '503c5a32a4e718282b88f73e602c09e1bda49aec':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 13:18:58 -08:00
David Christie
a87bdc1f8f Merge commit 'bc39746e' into manualmerge 2014-01-10 13:17:01 -08:00
David Christie
503c5a32a4 am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit 'ea47cb6763d36fcc916c63dd764b48b4b6f1ff01':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 13:14:04 -08:00
David Christie
ea47cb6763 am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit 'bf6cecc21f50d1bc98e0d2dec41bef3ce259a23f':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 13:10:12 -08:00
David Christie
bf6cecc21f am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit '5716e4bfb980c8bab01b51944c1e715d76d59b1d':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 13:05:35 -08:00
David Christie
5716e4bfb9 am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit '776b3956a9742b868b037dffd2b24c17b2dfa0e6':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 13:02:48 -08:00
David Christie
776b3956a9 am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit '7f4d82932c812fbac1d99ceaf9462b7a763f5231':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 13:00:09 -08:00
David Christie
7f4d82932c am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit '6826387e50f9f272d53ca1f725f573bbddcdf5c1':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 12:55:24 -08:00
David Christie
bc39746ee9 am 8e0c7768: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit '8e0c7768c87014fef277df84c737dd6c37fb8866':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 12:53:41 -08:00
Deepanshu Gupta
5ad7c183f3 Fix the measurement of text bounds. 
Bug: 12366230
Change-Id: I203b678363dc7b688c744503ee10216baca658a9
 2014-01-07 12:07:45 -08:00
David Christie
6826387e50 DO NOT MERGE: Clear cached locations when location providers disabled 
Bug: 12118307

Change-Id: I8595b50d30c0f3ff2cc7dab14141a739cd6b9daa
 2014-01-06 18:15:05 -08:00
David Christie
8e0c7768c8 DO NOT MERGE: Clear cached locations when location providers disabled 
Bug: 12118307

Change-Id: Iae668409be5c5bd715681624b2a54a4daa690932
 2014-01-06 17:57:30 -08:00
David Christie
766b5c4342 Clear cached locations when location providers disabled 
Bug: 12118307

(cherry picked from commit b084fef18ee1b5d24d15cff37dc3a053933d361e)

Change-Id: Ief869b9e38858092bfa3f8d6d090a278dee7d86c
 2014-01-06 15:30:34 -08:00
David Christie
75c55f92f5 Clear cached locations when location providers disabled 
Bug: 12118307

(cherry picked from commit b084fef18ee1b5d24d15cff37dc3a053933d361e)

Change-Id: I49eff73f89633052a2587112cdc381ae6d254bfe
 2014-01-06 15:23:39 -08:00
Dave Platt
76e5ca81b3 Fix descriptor leak after accepting connections 
After accepting a connection on a listening socket and
storing the resulting FileDescriptor into a newly created
LocalSocketImpl, the new impl's "descriptor was created
locally and should be closed normally" flag should be set.

Bug: 11805817

(cherry picked from commit 3e7305c6bf6062b5cb1e2ddcec6c6d30b4a8bc0d)

Change-Id: I723d7c5544ee4b6858894c215716cbc32a958df1
 2014-01-06 14:31:28 -08:00
Dave Platt
02f042ddd9 Fix socket descriptor leak from Zygote to child app 
Due to an API change in LocalSocket, Zygote must now
manually close the FileDescriptor it created when it
registered a LocalServerSocket.  The LocalSocket.close()
routine will no longer do so.

Bug: 12114500

(cherry picked from commit 70ef29b04ee4ef7d7acfec79041dbe800961195e)

Change-Id: Ief23a3c99e007dc4aa6f94dfb47a1b2b6c854dad
 2014-01-06 13:59:20 -08:00
Baligh Uddin
fd8be467a3 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-01-06 21:45:16 +00:00
Baligh Uddin
b852d28cc1 Import translations. DO NOT MERGE 
Change-Id: Ic05c1c30830a0c9d7cb62fd53f6b144650e05609
Auto-generated-cl: translation import
 2014-01-06 13:15:51 -08:00
Baligh Uddin
6e15a49eee Import translations. DO NOT MERGE 
Change-Id: Iad53d8fd9f6b72114c8ab0444d60e8fed54f1df9
Auto-generated-cl: translation import
 2014-01-06 12:16:37 -08:00
Baligh Uddin
2ae0419fb1 Import translations. DO NOT MERGE 
Change-Id: I749221e72ed6ab7c58b9b606e6818c884d6c1f34
Auto-generated-cl: translation import
 2013-12-30 09:30:42 -08:00
Baligh Uddin
bbeb313567 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-12-26 20:58:31 +00:00
Baligh Uddin
5a736a99f8 Import translations. DO NOT MERGE 
Change-Id: Iea7a801a62b52fd1685e7d9904a1e805c0d19827
Auto-generated-cl: translation import
 2013-12-26 11:09:48 -08:00
Baligh Uddin
7bb3e3b9ee Merge "Import translations. DO NOT MERGE" into klp-dev 2013-12-26 19:09:19 +00:00
Baligh Uddin
64ec792948 Import translations. DO NOT MERGE 
Change-Id: I190a7af8c85eb4b59ed14bd55f5ed2ff85e55698
Auto-generated-cl: translation import
 2013-12-26 11:07:34 -08:00
Baligh Uddin
ea227306d6 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-12-26 18:41:56 +00:00
Baligh Uddin
8677794bfa Import translations. DO NOT MERGE 
Change-Id: I010c6031e2bb9bfe71261008db8945116088a590
Auto-generated-cl: translation import
 2013-12-26 10:16:09 -08:00
Baligh Uddin
d6e863a19a Import translations. DO NOT MERGE 
Change-Id: Ia1e9dd788744e22237845d094d414dc4f57713be
Auto-generated-cl: translation import
 2013-12-26 09:53:23 -08:00
Baligh Uddin
c5b19fd397 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-12-19 04:49:33 +00:00
Baligh Uddin
986859998c Import translations. DO NOT MERGE 
Change-Id: I3fa88a4097e6971c92bda10756ffd3699276bac3
Auto-generated-cl: translation import
 2013-12-18 16:36:21 -08:00
Baligh Uddin
50391871e6 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-12-19 00:14:26 +00:00
Baligh Uddin
3cc579ebac Import translations. DO NOT MERGE 
Change-Id: I30e27dc30d542e9f2d3a23b3b1831cbd99e4b920
Auto-generated-cl: translation import
 2013-12-18 15:37:22 -08:00
Baligh Uddin
db41eaef90 Import translations. DO NOT MERGE 
Change-Id: Id35b27dea34c2fbad7dcfe2b30a34b26beb4e989
Auto-generated-cl: translation import
 2013-12-18 15:11:27 -08:00
Baligh Uddin
0a10215044 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-12-11 21:32:53 +00:00
Baligh Uddin
9ad3907169 Import translations. DO NOT MERGE 
Change-Id: I3065b51a4d5b72fc2dbd65f34f2b7dec89fb37d7
Auto-generated-cl: translation import
 2013-12-11 12:55:02 -08:00
Baligh Uddin
60835d4be4 Import translations. DO NOT MERGE 
Change-Id: Ifd2fd893861b827395080d8bfde873be9c0e7425
Auto-generated-cl: translation import
 2013-12-11 12:46:13 -08:00
Baligh Uddin
0bfbb67627 Import translations. DO NOT MERGE 
Change-Id: Iaac5bb8f0ee9e7471e6f6401eab46a86a406ce4c
Auto-generated-cl: translation import
 2013-12-09 09:53:12 -08:00