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

158916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
3c8cf51f86 Merge "Stop using apache http to download Gps XTRA data." 2014-10-27 16:16:11 +00:00
Calin Juravle
f7d24d2443 Merge "PreInitializeNativeBridge only if its Available" 2014-10-27 15:16:03 +00:00
Calin Juravle
79ec4c15ab PreInitializeNativeBridge only if its Available 
Also, assert that we always have a private application directory for non
system_server case.

Change-Id: I8397d7f7b04cde0bf65b60ca415bf3f4b349783c
 2014-10-27 14:45:33 +00:00
Chih-Hung Hsieh
d3448e437a Suppress Clang compilation warnings. 
Ignore warnings about unused parameters and initialization of static
constant float data members.

Change one potential error of allocating variable length
array of non-POD element type on stack.

Fix mismatch of class and struct declaration tags.

BUG: 17512760
Change-Id: I3a09c945fb1c17f27aff74a7e439dd4c35d1fb32
 2014-10-24 15:42:14 -07:00
Craig Mautner
9d9aac4cac resolved conflicts for merge of 2bf3800b to stage-aosp-master 
Change-Id: I3e650f90521e4d615504c3423ab228966389a482
 2014-10-24 13:12:08 -07:00
Narayan Kamath
3f2714e18b Remove unused apache related API. 
Hidden and used only in unit tests.

Change-Id: I492b735f0f7e129946e28c31ad9d91c98aacf987
 2014-10-24 14:27:07 +01:00
Narayan Kamath
3f2d1a460a Remove tests/SslLoad. 
Crufty code that hasn't been touched in the past five years.
The test seems generally useless and there are dozens of richer
tests and benchmarks in conscrypt and libcore.

Change-Id: Ifbec8d419fd37f3b6323c9c74f47d0b7c85c9d4b
 2014-10-24 14:16:41 +01:00
Narayan Kamath
c273edbba5 Stop using apache http to download Gps XTRA data. 
Also, general cleanup of unused parameters.

Change-Id: Iebd1aa05de9cd676b0b6d08c99df8c15b8e8473c
 2014-10-24 13:41:27 +01:00
Elliott Hughes
ced7ebdb1d Merge "Migrate off timeFormat12 and timeFormat24." 2014-10-23 18:21:56 +00:00
Elliott Hughes
f7d5e0a53e Migrate off timeFormat12 and timeFormat24. 
libcore now offers a wider variety of 12-/24-hour time formats,
so be more specific about which one we want here.

(cherry-pick of 85f60d3a03b5b5d9a0e8b8a138eb85a6b53a1eca.)

Bug: 10361358
Change-Id: I846ab7a6f84cd49e876ad21e9366aff1600e0530
 2014-10-23 11:18:21 -07:00
Craig Mautner
2bf3800b10 Merge "Doesn't re-sort app windows when move task to top" 2014-10-22 21:19:43 +00:00
Bill Yi
5a71f83227 Merge lmp-dev-plus-aosp-without-vendor into stage-aosp-master 
Change-Id: I7063b7b52e9c09a57eb6bf3b4ffa3716d58ebf43
 2014-10-22 09:00:49 -07:00
Andreas Gampe
2b3a8cd808 Frameworks/base: Wall Werror in libs/storage 
Turn on -Wall -Werror in libs/storage.

Change-Id: I314cb32d0a917f9261488f7709d9a78a07b10fea
 2014-10-22 08:15:54 -07:00
tingna_sung
27d2ea2242 Doesn't re-sort app windows when move task to top 
To avoid app window isn't moved by new task order when move task to top

Change-Id: I5f8a901bb2f20a163b7fa0a59d1dc58c1fca5f1f
Signed-off-by: tingna_sung <tingna_sung@htc.com>
 2014-10-22 11:58:06 +08:00
Craig Mautner
52656916e3 am 4c101015: Merge "Avoid to skip app window due to un-assigned sending to bottom state while app window sort" 
* commit '4c1010152e487d3471e6703e8a9f8c1010488d47':
  Avoid to skip app window due to un-assigned sending to bottom state while app window sort
 2014-10-21 19:45:41 +00:00
Craig Mautner
4c1010152e Merge "Avoid to skip app window due to un-assigned sending to bottom state while app window sort" 2014-10-21 19:24:18 +00:00
Elliott Hughes
09a7d324ef am 388dbd28: Merge "Include <time.h> for clock_nanosleep." 
* commit '388dbd28ac977782c2ff7a0ba97e2fbfaebfed4b':
  Include <time.h> for clock_nanosleep.
 2014-10-21 17:53:50 +00:00
Elliott Hughes
388dbd28ac Merge "Include <time.h> for clock_nanosleep." 2014-10-21 17:49:03 +00:00
Elliott Hughes
bb94f3107e Include <time.h> for clock_nanosleep. 
Change-Id: If3098fa03003bce5d06d60e9129c10cce3c850bb
 2014-10-21 10:41:33 -07:00
tingna_sung
9dde78f7da Avoid to skip app window due to un-assigned sending to bottom state while app window sort 
should assign value of WindowToken.sendingToBottom according to the state of this token is moved to top or bottom
to avoid app window is skiped incorrectly due to sending to bottom state is un-assigned while app window sort
and finding focus window.

Change-Id: I190838d1d01ca229155d5176930178ab41335556
Signed-off-by: tingna_sung <tingna_sung@htc.com>
 2014-10-22 00:07:08 +08:00
Dan Albert
3d23d557ff am 7f2bc6c7: Merge "More LOCAL_ADDITIONAL_DEPENDENCIES." 
* commit '7f2bc6c73b9f21515235fb638a0f510af3c45b44':
  More LOCAL_ADDITIONAL_DEPENDENCIES.
 2014-10-21 16:06:36 +00:00
Dan Albert
7f2bc6c73b Merge "More LOCAL_ADDITIONAL_DEPENDENCIES." 2014-10-21 16:03:10 +00:00
Dan Albert
00b4e773ab More LOCAL_ADDITIONAL_DEPENDENCIES. 
Change-Id: I9bf20507442b0722e93446fdb32d8236be974e28
 2014-10-21 08:58:39 -07:00
Dmitriy Ivanov
a0d07d49b8 am 9be7db6e: am 952dd924: Merge "Switch to libsigchain.a" 
* commit '9be7db6e3bc374efd9dcff744deab92148e20dbd':
  Switch to libsigchain.a
 2014-10-21 03:29:46 +00:00
Dmitriy Ivanov
9be7db6e3b am 952dd924: Merge "Switch to libsigchain.a" 
* commit '952dd9241675fe73d4246dc16232682b32952bd3':
  Switch to libsigchain.a
 2014-10-21 03:22:34 +00:00
Dmitriy Ivanov
952dd92416 Merge "Switch to libsigchain.a" 2014-10-21 03:14:28 +00:00
RoboErik
e55300b14a am 2fa604fc: Merge "Add missing break to switch statement" into lmp-dev 
* commit '2fa604fc59ded63a416066a0bc66f63069cae7f3':
  Add missing break to switch statement
 2014-10-20 22:13:58 +00:00
RoboErik
2fa604fc59 Merge "Add missing break to switch statement" into lmp-dev 2014-10-20 22:08:07 +00:00
Dan Albert
2095ed4ef6 am 9295a135: am e40974d9: Merge "Fix an overflow found by ASAN." 
* commit '9295a1354eb8220be9a0a40985253c6cdfac35c3':
  Fix an overflow found by ASAN.
 2014-10-20 22:01:02 +00:00
RoboErik
59759903a9 Add missing break to switch statement 
the skip to queue item case was falling through when it shouldn't.

bug: 18058515
Change-Id: Ica20b59efad12a58ad16501146fc9a0d4595e184
 2014-10-20 14:56:32 -07:00
Dan Albert
9295a1354e am e40974d9: Merge "Fix an overflow found by ASAN." 
* commit 'e40974d92873462c4f1b100c7d03b3f41756c807':
  Fix an overflow found by ASAN.
 2014-10-20 21:54:41 +00:00
Dan Albert
e40974d928 Merge "Fix an overflow found by ASAN." 2014-10-20 21:48:44 +00:00
Dan Albert
d395f79133 Fix an overflow found by ASAN. 
Sometimes len is 0.

Change-Id: I031000188edc57663a5519b00cbbb751600d32f4
 2014-10-20 14:45:55 -07:00
smain@google.com
22fc33d645 am 21de5f3f: Doc change: misc changes to highlights. 
* commit '21de5f3f12071458c2a1cf3dd39bb9271ee13e92':
  Doc change: misc changes to highlights.
 2014-10-20 21:40:33 +00:00
smain@google.com
21de5f3f12 Doc change: misc changes to highlights. 
Change-Id: I60964bf1d8e299985da9ca6b2b6cfb70a1477bbc
 2014-10-20 14:34:22 -07:00
Dmitriy Ivanov
5ba317cee0 Switch to libsigchain.a 
Use LOCAL_WHOLE_STATIC_LIBRARIES to instruct static linker
 to export symbols from the static library.

Change-Id: I465806dcffc777a682523f74ae6f7ab61aaa6962
 2014-10-20 14:14:39 -07:00
Adam Lesinski
3986e52cf9 am 3f8c7dec: Merge "AAPT: Fix path for final generated resources on Windows" into lmp-dev 
* commit '3f8c7dec6b3fd4ac7fc99fe4e41cd0fa1b97bcad':
  AAPT: Fix path for final generated resources on Windows
 2014-10-20 20:59:49 +00:00
Adam Lesinski
3f8c7dec6b Merge "AAPT: Fix path for final generated resources on Windows" into lmp-dev 2014-10-20 20:55:48 +00:00
ztenghui
b12ff84159 am 877ce2c4: Merge "Make sure the bitmap from VD\'s cache is drawn using bi-linear filter." into lmp-dev 
* commit '877ce2c42b5d423719246f5458cd66fa9fddb317':
  Make sure the bitmap from VD's cache is drawn using bi-linear filter.
 2014-10-20 20:36:34 +00:00
ztenghui
877ce2c42b Merge "Make sure the bitmap from VD's cache is drawn using bi-linear filter." into lmp-dev 2014-10-20 20:29:17 +00:00
Adam Lesinski
aff7c2447d AAPT: Fix path for final generated resources on Windows 
Change-Id: Id11ac79b281b51747c73f90406ebd60023c54f92
 2014-10-20 12:15:25 -07:00
RoboErik
c0d8bc38e1 am 578fbe89: Merge "Set the metadata rating correctly in RCC" into lmp-dev 
* commit '578fbe898f1652b3166bd4e20647572dec9dfb14':
  Set the metadata rating correctly in RCC
 2014-10-20 19:10:42 +00:00
RoboErik
578fbe898f Merge "Set the metadata rating correctly in RCC" into lmp-dev 2014-10-20 19:07:52 +00:00
Geoff Mendal
f8d3c35469 am 00831836: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '00831836cdeeb4a61ba10c724c3ca33280937b62':
  Import translations. DO NOT MERGE
 2014-10-20 17:02:22 +00:00
Geoff Mendal
00831836cd Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-20 16:56:51 +00:00
smain@google.com
6750992759 am 065b94c6: update workplace description in lollipop highlights bug: 18038081 
* commit '065b94c6a634e7a765f2674cff696a75e76f6425':
  update workplace description in lollipop highlights bug: 18038081
 2014-10-20 16:56:32 +00:00
smain@google.com
065b94c6a6 update workplace description in lollipop highlights 
bug: 18038081

Change-Id: I612fc52392bc0fb71cc2e7b4c0da1fcaae6ac6fe
 2014-10-20 09:48:33 -07:00
RoboErik
38696ba77d Set the metadata rating correctly in RCC 
We weren't setting the ratings in the new MediaMetadata from RCC.
This adds some code to set them correctly.

bug:18051829
Change-Id: I358eeb2b25b3fb9bd9a5d207eb3314bb2cdff25e
 2014-10-20 09:48:13 -07:00
Geoff Mendal
c09f8b7a08 Import translations. DO NOT MERGE 
Change-Id: I3dd702947875349b8ca04edb813687588e4db689
Auto-generated-cl: translation import
 2014-10-20 09:34:39 -07:00
Geoff Mendal
d1311fbf38 Merge "Import translations. DO NOT MERGE" into lmp-dev 
automerge: bae5d85  -s ours

* commit 'bae5d85a773af7c40578160ca4ba4261de0c68c5':
  Import translations. DO NOT MERGE
 2014-10-20 13:58:44 +00:00