59783 Commits

Author SHA1 Message Date
Narayan Kamath
c46d2a2dca Merge "camera2: Clarify the documentation on the ImageReader usecase" 2015-01-07 18:31:56 +00:00
Martin Storsjo
5c533e4fa0 camera2: Clarify the documentation on the ImageReader usecase
Uncompressed JPEG data is an oxymoron. Also mention the other
usecases for ImageReader.

Change-Id: I75261baf162a58c415705db99afa474c3826f900
2015-01-07 20:10:25 +02:00
Vladimir Marko
8371f2e3fa Merge "Check for OOM in BitmapFactory's getMimeTypeString()." 2015-01-07 10:20:50 +00:00
Amith Yamasani
dcf323adaf Merge "NPE in SearchManager.triggerSearch" 2015-01-07 00:05:11 +00:00
Vladimir Marko
7ab249a18e Check for OOM in BitmapFactory's getMimeTypeString().
Bug: 18909596
Change-Id: If65fe45f5fd569a99a0cae1d31117af262bca430
2015-01-06 18:40:08 +00:00
Narayan Kamath
024191b57f Merge "Fix comment. It should be 'or' not 'of'." 2015-01-06 09:46:17 +00:00
riddle_hsu
1f5ac4d322 [ActivityManager] Distinguish FG or BG receiver finished
Symptom:
Assume a foreground broadcast FG and a background BG.
If a recevier registers both FG and BG. When sending
BG and FG to the receiver, and the receiver BG receiver
completes first, its finishReceiver will trigger next FG
receiver rather than BG, and also deliver wrong result
code/data to the next.

More detail and sample:
https://code.google.com/p/android/issues/detail?id=92917

Root cause:
Due to BroadcastQueue:getMatchingOrderedReceiver will match
by receiver(IBinder), so the caller ActivityManagerService:
broadcastRecordForReceiverLocked will always match the first
queue(fg) if a receiver is both receiving fg and bg.

Solution:
Add a parameter flags to finishReceiver, then server side
could know the finished receiver should belong to which queue.

Another general solution but with bigger scope:
I60dce4a48e20c1002a61a979e4d78b9b0a8b94a0

Change-Id: I913ca6f101ac8ec6c7a8e42754e6781f80247b7f
2015-01-03 15:38:21 +08:00
Paul Quei
65e37ee936 fix issuse 65774
"Some vendors have there own well defined specifications ...". Should be "Some vendors have their own well defined specifications ..."

Change-Id: I0d770ac0591812c1c61389eb0078493098784323
Signed-off-by: Paul Quei <paulquei@gmail.com>
2015-01-02 10:21:55 +00:00
Narayan Kamath
38c2dae5f1 Merge "Remove hardcoded include paths." 2014-12-31 10:08:49 +00:00
Narayan Kamath
bc2cc2f350 Remove hardcoded include paths.
ICU, zlib & openssl export them using LOCAL_EXPORT_C_INCLUDE_DIRS.
The dependency on libc/dns/include was bogus and can be removed
trivially.

bug: 18581021
Change-Id: I4b8047ff0df1050ab48b61c0c886888b3f2f0c18
2014-12-31 10:06:51 +00:00
Narayan Kamath
5ae63a258b Merge "Fixed grammar in the comment that introduces the Debug.MemoryInfo class." 2014-12-29 12:08:58 +00:00
Narayan Kamath
712a02050e Merge "Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT"" 2014-12-29 10:02:28 +00:00
Elliott Hughes
ee435b16d8 Merge "telephony: Update comments for preferred network mode" 2014-12-26 18:48:57 +00:00
Sungmin Choi
e099ab18e6 telephony: Update comments for preferred network mode
Change-Id: I4718674ff73116cc6bbec4540c3450ed14663c0d
2014-12-25 07:39:37 +00:00
Seonggoo Kang
72745fffe8 Prevent duplicated registration of OnComputeInternalInsetsListener
OnComputeInternalInsetsListener is added when initViews is called,
and initViews is called by onCreate and onConfigurationChanged.
But it is removed only by onDestroy.
Therefore listeners are accumulated and it results performance issue.
So before adding, remove mInsetListener that was previously added.

Change-Id: I494d3f1875613d73d3f9b8e2af286b5800f03196
2014-12-24 14:05:17 +09:00
Andreas Gampe
08b2d585b1 Core/jni: Remove Dalvik options from AndroidRuntime
Dalvik is dead. Remove old command-line options from AndroidRuntime.

Bug: 18833580
Bug: 18834205
Change-Id: If9a6f78cc0d74fc7a596b08065059b388a8d4b2f
2014-12-22 14:57:18 -08:00
Elliott Hughes
5cd79d0708 Merge "Move the remaining ZygoteInit native code over to Java." 2014-12-18 16:55:23 +00:00
Elliott Hughes
93241de734 Merge "Remove a bitrotted test." 2014-12-18 00:32:01 +00:00
Elliott Hughes
988fd73499 Remove a bitrotted test.
Change-Id: I4c44f2da0544dbfde8e340f7f477191725c5fb8b
2014-12-17 16:29:04 -08:00
jgu21
4741cd92d1 Get the instruction set that the libraries of secondary Abi is supported.
The secondary Abi is for the apps which support the mulitArch feature.
In presence of a native bridge the instruction set supported by
secondary Abi might be different than the one secondary Abi used.

Change-Id: I318fb21e45c34de6cf1bf8ff63519aaa2b1e2520
Signed-off-by: jgu21 <jinghui.gu@intel.com>
2014-12-17 17:23:29 -05:00
Olawale Ogunwale
486a9942eb Merge "[ActivityManager] Use synchronized to protect object" 2014-12-17 21:42:44 +00:00
Elliott Hughes
26b56e628b Move the remaining ZygoteInit native code over to Java.
Bug: 18719692
Change-Id: I5f9834edecdbcc065a33a9921c740a53441636a4
2014-12-17 12:28:29 -08:00
Elliott Hughes
e6d63b9462 Merge "Rewrite selectReadable JNI in Java." 2014-12-17 18:21:06 +00:00
Narayan Kamath
6d41504d2c Merge "Move frameworks users over to libcore hex encoding API." 2014-12-17 13:34:00 +00:00
Marcus Mueller-Jung
61cb6b09ce Deutsche Telekom VVM free SMS shortcodes DE
The Deutsche Telekom “Mobilbox Pro” App (Visual Voicemail) uses SMS for
provision, these SMSs are free to the user, so the premium SMS notification
creates confusion. To avoid this notification, DTAG has harmonized two
short codes in Germany, 81214 and 81215, which are free in all German mobile
networks and should be whitelisted. Once whitelisted, these 2 codes will be
used by the client.

Change-Id: Id981b1d7abf83c2dc4a5846aa8a40b37e2e12409
Signed-off-by: Marcus Mueller-Jung <marcus.mueller-jung@telekom.de>
2014-12-17 13:20:27 +00:00
Elliott Hughes
894724be30 Rewrite selectReadable JNI in Java.
Bug: 18719692
Change-Id: Id4fa95a31f112c720f7a3ac47a3b6c95c3028438
2014-12-16 10:00:33 -08:00
Narayan Kamath
78108a3e52 Move frameworks users over to libcore hex encoding API.
Removes dependency on apache-http.

bug: 18027885
Change-Id: I508db016747985ecdd68e02d5d4efcd0ddd694df
2014-12-16 17:25:07 +00:00
mark_chen
89764e337b [ActivityManager] Use synchronized to protect object
Symptom: ArrayIndexOutOfBoundsException at mResourcePackages
Root Cause: Race condition issue
Solution: Use synchronized to protect object

Change-Id: Ia2d89d50919d95d95f6f8ac2eb75594a93e8f2da
2014-12-16 05:44:34 +00:00
Christopher Tate
b32a33cec1 Merge "Turn debug flag off" 2014-12-16 02:53:13 +00:00
Elliott Hughes
dac83f5e6a Reimplement reopenStdio in Java.
Bug: 18719692
Change-Id: I4ed984cd6148c5cba75d46a60f32a0687a5bcac3
2014-12-15 11:00:25 -08:00
Alan Jeon
f0e32ee572 Turn debug flag off
Change-Id: Iced1a24ecfc182eccedd3a749fab9dd32dea41da
Signed-off-by: Alan Jeon <skyisle@gmail.com>
2014-12-13 22:44:53 +09:00
Elliott Hughes
3fe595108f Lose some unnecessary JNI from the zygote.
Bug: 18719692
Change-Id: Ie2d50400f10f3c54cfbf94e54656f6d704eac267
2014-12-12 14:07:34 -08:00
Chih-hung Hsieh
4c23a0ec16 Merge "Adjust format strings to work on both 32-bit and 64-bit builds" 2014-12-11 20:49:30 +00:00
Elliott Hughes
da30b545f9 Merge "Fix typo." 2014-12-09 16:02:57 +00:00
Elliott Hughes
0adcf15ad8 Fix typo.
Bug: https://code.google.com/p/android/issues/detail?id=78422
Change-Id: I0dfbb74334e126062660831a4e01817dde068b56
2014-12-08 20:50:00 -08:00
Mathieu Chartier
fb5c932dbb Merge "Add more -d dalvik details to dumpsys" 2014-12-09 02:05:45 +00:00
Mathieu Chartier
063028aa68 Add more -d dalvik details to dumpsys
Added .NonMoving for the non moving space.
Added .Zygote for the zygote.
Added .IndirectRef for indirect reference tables (jobjects).

Example:
 Dalvik Details
        .Heap     2264     2264        0        0
         .LOS       80       80        0        0
          .GC      144      144        0        0
      .Zygote      331      196        0     2428
   .NonMoving      540      540        0        0
 .IndirectRef       20       20        0        0

Bug: 18672069
Change-Id: Id14e5bc92ceb15fe7a17d9fb035f18aa2925e50c
(cherry picked from commit 25c5e2b12d5d5d06739e3f70a0da968d97935b46)
2014-12-08 17:33:56 -08:00
Bernhard Rosenkränzer
46c82b4cd2 Adjust format strings to work on both 32-bit and 64-bit builds
Adjust format strings to not produce Clang warnings in both 32-bit and
64-bit builds

Change-Id: I76c29d8d5d0fb4b5e9d9518077652370ffe9e871
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2014-12-05 16:14:07 -08:00
Adam Powell
8c9283f410 Merge "Fix NullPointerException in ListView" 2014-12-05 19:26:18 +00:00
Mike Lockwood
448403b7a4 Merge "Dont call close in in BluetoothA2dp finalize" 2014-12-04 21:41:13 +00:00
Adam Lesinski
e89a286541 Merge changes If2c7e09f,Ie21f227c
* changes:
  RRO idmap: pad with 0xffffffff, not 0x00000000
  RRO: reintroduce lost ResTable insert of assets
2014-12-02 22:52:37 +00:00
Chris Wren
acd01ff076 Merge "Keep deleteIntent when copying Notification attributes" 2014-12-02 22:31:09 +00:00
Alan Viverette
71c5d62d96 Merge "Consider RTL layout in DPAD navigation in AbsSeekBar" 2014-12-02 19:21:22 +00:00
Jesse Hall
1ee377764a Merge "Avoid overwriting EGL14.EGL_NO_SURFACE" 2014-12-02 00:35:12 +00:00
Yohann Roussel
6829daa44a Merge "Add tests about annotations and enum." 2014-12-01 09:30:59 +00:00
Craig Mautner
208bd91b24 Merge "[ActivityManager] Avoid system server crash due to package removed" 2014-12-01 00:11:52 +00:00
Narayan Kamath
f1a9b1bc24 Stop using ErrorStrings for apache.
These strings only ever end up in logcat (at best), so there's no
point having them translated. Also, rename the ErrorStrings class
and move it android.webkit where the last remaining caller lives.

(congrats webview people, this is now your mess to maintain.)

Change-Id: I04dae37c34191b26a69282970318c1b782af1edf
2014-11-27 17:23:41 +00:00
Narayan Kamath
0ea4e7b581 Delete general sounding "CharArrayBuffers" class.
Move the code to the only point of use. Preparatory work for
decoupling apache-http from the frameworks.

Change-Id: Ieee54bb725cbac19d0c7513867635df6fbcf2b49
2014-11-27 13:52:11 +00:00
Narayan Kamath
3ec2def9a3 Delete unused class from android.net.http.
Foundation for moving a lot of these classes out of the frameworks
and @removing these APIs.

Change-Id: I590cdd2867b923533de189ec956b4dd3f82efa46
2014-11-27 12:52:48 +00:00
Ignacio Solla
c67b21fa3f Merge "[WebView] Allow the WebView to be compiled against the system SDK." 2014-11-26 18:31:01 +00:00