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

179662 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
RoboErik
7554d099e7 Reload MediaBrowser children on each call to subscribe 
Only one callback can be set on a given media id on MediaBrowser. When you
try to subscribe with a new callback it replaces the old callback, but it
wasn't resending the child data for the id. This causes calling subscribe
again also cause the data to be reloaded and sent to the app again.

bug:18683452
Change-Id: I2d30dbbbfe07cb9a720fb6d65664c1c4c58cb637
 2015-01-07 10:14:04 -08: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
Wale Ogunwale
6763058fe7 am f61bc8a2: Merge "Bring task with root activity to front when launching from recents." into lmp-mr1-dev 
* commit 'f61bc8a2624bc70c903238229a62abc3351ed620':
  Bring task with root activity to front when launching from recents.
 2015-01-07 18:08:55 +00:00
Wale Ogunwale
f61bc8a262 Merge "Bring task with root activity to front when launching from recents." into lmp-mr1-dev 2015-01-07 18:02:41 +00:00
Geoff Mendal
308ad16e52 am 56db8228: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
automerge: ec08d88  -s ours

* commit 'ec08d889a1b6e35742bcc1bac72fd7a40b5b2a4e':
  Import translations. DO NOT MERGE
 2015-01-07 17:09:53 +00:00
Geoff Mendal
ec08d889a1 am 56db8228: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '56db82282d701c81cedb38b246716e406c2158ff':
  Import translations. DO NOT MERGE
 2015-01-07 17:07:26 +00:00
Geoff Mendal
56db82282d Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-01-07 17:02:35 +00:00
Geoff Mendal
fb7a35fc1f Import translations. DO NOT MERGE 
Change-Id: I91b076501cd9499fcd60f899fe7299735bf8c140
Auto-generated-cl: translation import
 2015-01-07 08:58:27 -08:00
John Spurlock
ee7712c0a9 Merge "Remove two obsolete status bar icons." 2015-01-07 16:45:23 +00:00
John Spurlock
f55bb573b2 Remove two obsolete status bar icons. 
Change-Id: I054d90044b889642ae3ba7affce71304ca44ca8d
 2015-01-07 11:36:32 -05:00
Jason Monk
5c530d8803 Merge "SysUI: Separate SignalControllers into separate files" 2015-01-07 16:32:52 +00:00
Jason Monk
da68f59628 SysUI: Separate SignalControllers into separate files 
and remove the TODO that says to do it.

Change-Id: I54ac3f27f9246aea87d21f2a1da6608ae675aae6
 2015-01-07 11:19:10 -05:00
John Spurlock
6746cf096b Merge "Remove detestable tab characters." 2015-01-07 16:14:09 +00:00
Tom Hudson
40a0709a56 Merge "Merge frameworks/base changes from master-skia to master." 2015-01-07 16:13:42 +00:00
John Spurlock
5b13e92271 Remove detestable tab characters. 
Change-Id: Ia225720af80c07580e5a6ea5098b3d85da7a8dfe
 2015-01-07 11:12:58 -05:00
Jorim Jaggi
4af69ea0cf Merge "Remove dead code #8: Remove old keyguard "bouncer"" 2015-01-07 16:10:27 +00:00
Jorim Jaggi
26118d5260 Merge "Remove dead code #7: Remove unused SysUI resources" 2015-01-07 16:09:44 +00:00
Jorim Jaggi
e020360350 Merge "Remove dead code #6: Delete old recents implementation" 2015-01-07 16:09:05 +00:00
Jorim Jaggi
c892238496 Merge "Remove dead code #5: Remove KeyguardAccountView" 2015-01-07 16:08:26 +00:00
Ben Murdoch
5c6f043d4e Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2015-01-07 16:06:41 +00:00
Ben Murdoch
bc20686f92 am 6a3e7015: am d4bc9577: am 1eee52b1: Merge "Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation." into lmp-mr1-dev 
* commit '6a3e70159cbbd3c4b7df89165c280ea4f7d56fa5':
  Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation.
 2015-01-07 16:06:33 +00:00
Jorim Jaggi
0603209463 Merge "Remove dead code #4: Remove unused Keyguard strings" 2015-01-07 16:06:30 +00:00
Jorim Jaggi
359fc655ce Merge "Remove dead code #3: Remove unused Keyguard drawables" 2015-01-07 16:04:59 +00:00
Jorim Jaggi
d1a9feb322 Merge "Remove dead code #2: Remove unused Keyguard resources" 2015-01-07 16:04:41 +00:00
Jorim Jaggi
7b5eb5ca04 Merge "Remove dead code #1: Remove unused Keyguard classes" 2015-01-07 16:04:23 +00:00
Ben Murdoch
6a3e70159c am d4bc9577: am 1eee52b1: Merge "Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation." into lmp-mr1-dev 
* commit 'd4bc95770ddfcb8be63fa768ac9eaf27512f8107':
  Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation.
 2015-01-07 16:01:27 +00:00
Ben Murdoch
d4bc95770d am 1eee52b1: Merge "Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation." into lmp-mr1-dev 
* commit '1eee52b1aa0ba0cc05ac513d0fa91de9ee643faf':
  Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation.
 2015-01-07 15:55:12 +00:00
Ben Murdoch
1eee52b1aa Merge "Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation." into lmp-mr1-dev 2015-01-07 15:50:52 +00:00
Geoff Mendal
3f0545a7dc am d79d0310: (-s ours) am 585a210d: (-s ours) Import translations. DO NOT MERGE 
automerge: 4e46775  -s ours

* commit '4e46775ceb609220169ec8ff9c6a1310d3fd7c34':
  Import translations. DO NOT MERGE
 2015-01-07 15:39:30 +00:00
Geoff Mendal
4e46775ceb am d79d0310: (-s ours) am 585a210d: (-s ours) Import translations. DO NOT MERGE 
* commit 'd79d0310b1eb6e250b3009653ac0490f35fd95bd':
  Import translations. DO NOT MERGE
 2015-01-07 15:37:27 +00:00
Geoff Mendal
d79d0310b1 am 585a210d: (-s ours) Import translations. DO NOT MERGE 
* commit '585a210ddb09d41c5ee4347e991c4fc51e2dbebe':
  Import translations. DO NOT MERGE
 2015-01-07 15:32:10 +00:00
Geoff Mendal
585a210ddb Import translations. DO NOT MERGE 
Change-Id: I41b418841fd7a2c436257ec29312411b1277b867
Auto-generated-cl: translation import
 2015-01-07 07:24:21 -08:00
Ben Murdoch
574fa34dd5 Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation. 
Bug:18072267
Change-Id: I21eec752ca9a0a6c0dab92f3748e687dd13961fa
 2015-01-07 15:13:48 +00:00
Geoff Mendal
719d5b3df0 Import translations. DO NOT MERGE 
Change-Id: Idcfd4c630d636eeaaafd95085223178e395d0584
Auto-generated-cl: translation import
 2015-01-07 06:38:31 -08:00
Jorim Jaggi
6b88cdfba7 Remove dead code #8: Remove old keyguard "bouncer" 
Also squashes KeyguardViewBase and KeyguardSimpleHostView into
KeyguardHostView, uses a constant for the user activity timeout
(custom value no longer used).

Change-Id: I919b7d3de1dd1590b20e0f14f0e193ee2b3dc21e
 2015-01-07 15:20:37 +01:00
Jorim Jaggi
a9ef7929b8 Remove dead code #7: Remove unused SysUI resources 
Change-Id: I6e338dee76063d7d200967bef0ed1122c2769d42
 2015-01-07 15:20:28 +01:00
Jorim Jaggi
d61f2271c4 Remove dead code #6: Delete old recents implementation 
Change-Id: I93b1257563d6352a54141bd4c90d2d4587782fd2
 2015-01-07 15:20:13 +01:00
Jorim Jaggi
cd3b5b52ac Remove dead code #5: Remove KeyguardAccountView 
Change-Id: I04431625e922e9554ce55b852bd8ee571049339b
 2015-01-07 15:01:00 +01:00
Jorim Jaggi
8a8941aa1b Remove dead code #4: Remove unused Keyguard strings 
And also remove an unused class.

Change-Id: I50a8a21d99a85cf0d3c301e7b54f434679e1be26
 2015-01-07 15:00:41 +01:00
Jorim Jaggi
4726247b97 Remove dead code #3: Remove unused Keyguard drawables 
Change-Id: Ie11f0834bf55ae979bff78f249221afd553bfd8b
 2015-01-07 15:00:26 +01:00
Jorim Jaggi
a29e81bc7f Remove dead code #2: Remove unused Keyguard resources 
Change-Id: If5e2b62556e6ee158e09e399c7ddec337dba15d5
 2015-01-07 15:00:16 +01:00
Jorim Jaggi
5c60b64704 Remove dead code #1: Remove unused Keyguard classes 
Change-Id: I08327dd23072b4e793be40635f105ce0aa5f6f6f
 2015-01-07 15:00:04 +01:00
Robin Lee
8e99586830 am 26e2da8f: am 374c358d: Merge "Profile owner hint in warning for extra CAs" into lmp-mr1-dev 
automerge: 23bb3f1

* commit '23bb3f11cbe4ca64337b5b75c333ea891760213f':
  Profile owner hint in warning for extra CAs
 2015-01-07 12:43:41 +00:00
Robin Lee
23bb3f11cb am 26e2da8f: am 374c358d: Merge "Profile owner hint in warning for extra CAs" into lmp-mr1-dev 
* commit '26e2da8ff8bdd577c915620c93805f21ff1fd65e':
  Profile owner hint in warning for extra CAs
 2015-01-07 12:41:44 +00:00
Robin Lee
26e2da8ff8 am 374c358d: Merge "Profile owner hint in warning for extra CAs" into lmp-mr1-dev 
* commit '374c358dd201583771b7aa391c56618548f543a6':
  Profile owner hint in warning for extra CAs
 2015-01-07 12:36:11 +00:00
Robin Lee
374c358dd2 Merge "Profile owner hint in warning for extra CAs" into lmp-mr1-dev 2015-01-07 12:30:57 +00:00
Vladimir Marko
152d7282a4 Check for OOM in BitmapFactory's getMimeTypeString(). 
Bug: 18909596

(cherry picked from commit 7ab249a18e08bfefb8c2d60af1fb668c67ba4368)

Change-Id: Ie7be228442876d47faf37e3f664e378253dab6e3
 2015-01-07 11:50:04 +00:00
Vladimir Marko
2e61c04070 am bf31cb6b: am 8371f2e3: Merge "Check for OOM in BitmapFactory\'s getMimeTypeString()." 
automerge: 4e29869

* commit '4e2986940b2ff456693a805026c6910e950c42e2':
  Check for OOM in BitmapFactory's getMimeTypeString().
 2015-01-07 10:32:50 +00:00
Vladimir Marko
4e2986940b am bf31cb6b: am 8371f2e3: Merge "Check for OOM in BitmapFactory\'s getMimeTypeString()." 
* commit 'bf31cb6be4290ce161d99a2a70c318f665a14a77':
  Check for OOM in BitmapFactory's getMimeTypeString().
 2015-01-07 10:30:44 +00:00
Deepanshu Gupta
b5af276e5e am 2458f2b1: am fa490b78: am 984823f5: am 7f9582ce: am 48603a39: Fix tests on jenkins 
* commit '2458f2b12b5ec266538b2019b0f14fca4e772bdf':
  Fix tests on jenkins
 2015-01-07 10:25:58 +00:00