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

179519 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Gampe
93e6d6ede4 am ec64c0b6: am 022b1ba1: Merge "Core/jni: Disallow relocation for decryption" 
automerge: 555ea65

* commit '555ea653bae019379eb8d1aa70dfcb86789c19d3':
  Core/jni: Disallow relocation for decryption
 2015-01-07 22:17:25 +00:00
Andreas Gampe
555ea653ba am ec64c0b6: am 022b1ba1: Merge "Core/jni: Disallow relocation for decryption" 
* commit 'ec64c0b6e639b743398fb543218100fdaf9a7f69':
  Core/jni: Disallow relocation for decryption
 2015-01-07 22:16:11 +00:00
RoboErik
942b3ba71b am 13d1057d: am 2610d712: Don\'t unmute when trying to show volume UI. DO NOT MERGE 
automerge: 516fa49  -s ours

* commit '516fa49183b8fbd010e619dea4d041b24d784503':
  Don't unmute when trying to show volume UI. DO NOT MERGE
 2015-01-07 22:10:57 +00:00
Andreas Gampe
ec64c0b6e6 am 022b1ba1: Merge "Core/jni: Disallow relocation for decryption" 
* commit '022b1ba188b249b0f17d1b5e8ab3badbc529f98e':
  Core/jni: Disallow relocation for decryption
 2015-01-07 22:09:11 +00:00
RoboErik
516fa49183 am 13d1057d: am 2610d712: Don\'t unmute when trying to show volume UI. DO NOT MERGE 
* commit '13d1057d5b3ca46d00d627a89f0d37836b9db8fd':
  Don't unmute when trying to show volume UI. DO NOT MERGE
 2015-01-07 22:06:47 +00:00
Andreas Gampe
022b1ba188 Merge "Core/jni: Disallow relocation for decryption" 2015-01-07 22:05:12 +00:00
RoboErik
13d1057d5b am 2610d712: Don\'t unmute when trying to show volume UI. DO NOT MERGE 
* commit '2610d71251e3e376e2514f20986c81e5d55f1b55':
  Don't unmute when trying to show volume UI. DO NOT MERGE
 2015-01-07 22:00:28 +00:00
Fyodor Kupolov
a72151b54b Merge "Sync accounts of a specified user only" 2015-01-07 21:31:33 +00:00
neo.chae
155118fee8 Core/jni: Disallow relocation for decryption 
When decrypting a device, a tmpfs is temporarily mounted as /data,
the size of which is usually small. When the zygote, system server
and necessary apps are brought up, they will be compiled into the
tmpfs.

If the system image contains prebuilts, they will be relocated instead
of compiled. This is unnecessary. In this special situation it is
acceptable to run out of the prebuilt oat files without relocation,
which can save space in the tmpfs.

This patch ensures that the boot image is not being relocated.

Change-Id: I42bfb7e3039574b7e4f2772e0d395f093d59ed1b
Signed-off-by: Hyangseok Chae <neo.chae@lge.com>
 2015-01-07 13:28:36 -08:00
RoboErik
2610d71251 Don't unmute when trying to show volume UI. DO NOT MERGE 
When a MediaSession is active the adjust volume event to show UI was
causing the stream to be unmuted. Since this happens after every mute
event you were unable to mute while a session was active. This change
doesn't unmute for events that just show the UI.

bug:18844550
Change-Id: Ic8b0f1ab1354646724ead4572a973c302c275eab
 2015-01-07 20:13:31 +00:00
RoboErik
2b94d589c8 Don't unmute when trying to show volume UI 
When a MediaSession is active the adjust volume event to show UI was
causing the stream to be unmuted. Since this happens after every mute
event you were unable to mute while a session was active. This change
doesn't unmute for events that just show the UI.

bug:18844550
Change-Id: Ic8b0f1ab1354646724ead4572a973c302c275eab
 2015-01-07 12:11:09 -08:00
Geoff Mendal
382d6a9ed2 Merge "Import translations. DO NOT MERGE" 2015-01-07 18:46:15 +00:00
Narayan Kamath
fa8d52fef4 am e02fe5af: am c46d2a2d: Merge "camera2: Clarify the documentation on the ImageReader usecase" 
automerge: 6ed2140

* commit '6ed21403e7dea44a70ae06da64229a557ee19c98':
  camera2: Clarify the documentation on the ImageReader usecase
 2015-01-07 18:44:33 +00:00
Narayan Kamath
6ed21403e7 am e02fe5af: am c46d2a2d: Merge "camera2: Clarify the documentation on the ImageReader usecase" 
* commit 'e02fe5afac0bc792559a4c424ffc8391c501abfe':
  camera2: Clarify the documentation on the ImageReader usecase
 2015-01-07 18:42:57 +00:00
Geoff Mendal
5d2a778149 Import translations. DO NOT MERGE 
Change-Id: Ie481d48e65a34dfff6e669a0bd97a8e2ccd8801a
Auto-generated-cl: translation import
 2015-01-07 10:41:50 -08:00
Narayan Kamath
e02fe5afac am c46d2a2d: Merge "camera2: Clarify the documentation on the ImageReader usecase" 
* commit 'c46d2a2dca55da9ee54da5ba6b7473ee3addd51a':
  camera2: Clarify the documentation on the ImageReader usecase
 2015-01-07 18:36:05 +00:00
Narayan Kamath
c46d2a2dca Merge "camera2: Clarify the documentation on the ImageReader usecase" 2015-01-07 18:31:56 +00:00
Wale Ogunwale
cab68c7894 am 6763058f: am f61bc8a2: Merge "Bring task with root activity to front when launching from recents." into lmp-mr1-dev 
automerge: df3d130

* commit 'df3d1307d5141c394b0eb521d6beb7f262fb3e3f':
  Bring task with root activity to front when launching from recents.
 2015-01-07 18:17:18 +00:00
Wale Ogunwale
df3d1307d5 am 6763058f: am f61bc8a2: Merge "Bring task with root activity to front when launching from recents." into lmp-mr1-dev 
* commit '6763058fe74c31bd44b8c94e2911c72e9db68e97':
  Bring task with root activity to front when launching from recents.
 2015-01-07 18:14:39 +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
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