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

172588 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
Vladimir Marko
bf31cb6be4 am 8371f2e3: Merge "Check for OOM in BitmapFactory\'s getMimeTypeString()." 
* commit '8371f2e3fac04663dae2e5fb98dbce7e32325991':
  Check for OOM in BitmapFactory's getMimeTypeString().
 2015-01-07 10:24:43 +00:00
Vladimir Marko
8371f2e3fa Merge "Check for OOM in BitmapFactory's getMimeTypeString()." 2015-01-07 10:20:50 +00:00
Deepanshu Gupta
2458f2b12b am fa490b78: am 984823f5: am 7f9582ce: am 48603a39: Fix tests on jenkins 
* commit 'fa490b78df732f484475e214eec033f89c5b40b7':
  Fix tests on jenkins
 2015-01-07 10:17:51 +00:00
Quddus Chong
2c9d203c4a am dc1db5bf: am bc8b0541: am 96f11258: am dc649c8d: am 8a195822: Merge "docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727" into lmp-docs 
* commit 'dc1db5bf5413bc432c77910d11c15b0442b27ace':
  docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727
 2015-01-07 10:17:45 +00:00
Quddus Chong
585be9c014 am 0178c0d7: am 7628b728: am decac431: am 14694d6e: am 3bdc68ed: Merge "docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181" into lmp-docs 
* commit '0178c0d782fb19cc6235ef6722251a441734345e':
  docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181
 2015-01-07 10:17:39 +00:00
Quddus Chong
159b409121 am 1f03d4ba: am fbb27960: am 4d39cfa4: am a63d2b83: am b55e2bf0: Merge "docs: Updated the description of the enhanced camera APIs in L. bug: 18142680" into lmp-docs 
* commit '1f03d4ba753c9c75a430703e535f4c0cd9daef67':
  docs: Updated the description of the enhanced camera APIs in L. bug: 18142680
 2015-01-07 10:17:33 +00:00
Joe Fernandez
87df2ea08f am 912b2574: am 52aec00c: am ca14e6c8: am f50be1fc: am 91c35ce1: Merge "docs: studio index typo" into lmp-docs 
* commit '912b25743d241caa150fd56aa15d1a6b9c59e428':
  docs: studio index typo
 2015-01-07 10:17:26 +00:00
Joe Fernandez
dbe3aba4a5 am ea765e7d: am 76094382: am c6fe54ed: am 62c3abe7: am acb35e19: Merge "docs: studio bundle checksum update" into lmp-docs 
* commit 'ea765e7d803bd85c81c87611f76c4f176045c0f1':
  docs: studio bundle checksum update
 2015-01-07 10:17:20 +00:00
Joe Fernandez
b1c7f0215b am 909f840c: am 4c5b5cff: Merge "resolved conflicts for merge of ea0137ef to lmp-mr1-dev" into lmp-mr1-dev 
* commit '909f840cdaf4f172b29c2c56921c4619165c4820':
  docs: Checklist for TV Apps
 2015-01-07 10:17:13 +00:00
Deepanshu Gupta
fa490b78df am 984823f5: am 7f9582ce: am 48603a39: Fix tests on jenkins 
* commit '984823f543b58ff3c064a203762530f972870d64':
  Fix tests on jenkins
 2015-01-07 10:10:24 +00:00
Quddus Chong
dc1db5bf54 am bc8b0541: am 96f11258: am dc649c8d: am 8a195822: Merge "docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727" into lmp-docs 
* commit 'bc8b0541d7df2969264587c739e820eab7bbeea1':
  docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727
 2015-01-07 10:10:19 +00:00
Quddus Chong
0178c0d782 am 7628b728: am decac431: am 14694d6e: am 3bdc68ed: Merge "docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181" into lmp-docs 
* commit '7628b7282608e3995a800085746f9432b2e00623':
  docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181
 2015-01-07 10:10:13 +00:00
Quddus Chong
1f03d4ba75 am fbb27960: am 4d39cfa4: am a63d2b83: am b55e2bf0: Merge "docs: Updated the description of the enhanced camera APIs in L. bug: 18142680" into lmp-docs 
* commit 'fbb2796079ad17ecb5894766e518d14f7e37a0db':
  docs: Updated the description of the enhanced camera APIs in L. bug: 18142680
 2015-01-07 10:10:08 +00:00
Joe Fernandez
912b25743d am 52aec00c: am ca14e6c8: am f50be1fc: am 91c35ce1: Merge "docs: studio index typo" into lmp-docs 
* commit '52aec00cb4109ae56633e02dd698de0f0f0c9191':
  docs: studio index typo
 2015-01-07 10:10:03 +00:00
Joe Fernandez
ea765e7d80 am 76094382: am c6fe54ed: am 62c3abe7: am acb35e19: Merge "docs: studio bundle checksum update" into lmp-docs 
* commit '76094382cf8a8860f2fb3d837246deb1b8baed96':
  docs: studio bundle checksum update
 2015-01-07 10:09:58 +00:00
Joe Fernandez
909f840cda am 4c5b5cff: Merge "resolved conflicts for merge of ea0137ef to lmp-mr1-dev" into lmp-mr1-dev 
* commit '4c5b5cffa7412a66cb56fe7b78daa7c0ee3d689a':
  docs: Checklist for TV Apps
 2015-01-07 10:09:52 +00:00
Deepanshu Gupta
984823f543 am 7f9582ce: am 48603a39: Fix tests on jenkins 
* commit '7f9582ce616a81b70794d7942b39f8442f5ef9d5':
  Fix tests on jenkins
 2015-01-07 09:23:17 +00:00
Quddus Chong
bc8b0541d7 am 96f11258: am dc649c8d: am 8a195822: Merge "docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727" into lmp-docs 
* commit '96f11258ab19962c93b615c00b387bdc05c0d75b':
  docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727
 2015-01-07 09:23:10 +00:00
Quddus Chong
7628b72826 am decac431: am 14694d6e: am 3bdc68ed: Merge "docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181" into lmp-docs 
* commit 'decac4319172c5f1c618de93dcb2a15678c3e214':
  docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181
 2015-01-07 09:23:07 +00:00
Quddus Chong
fbb2796079 am 4d39cfa4: am a63d2b83: am b55e2bf0: Merge "docs: Updated the description of the enhanced camera APIs in L. bug: 18142680" into lmp-docs 
* commit '4d39cfa415f1c391a94b001319b8d1c7b02b61c2':
  docs: Updated the description of the enhanced camera APIs in L. bug: 18142680
 2015-01-07 09:23:02 +00:00
Joe Fernandez
52aec00cb4 am ca14e6c8: am f50be1fc: am 91c35ce1: Merge "docs: studio index typo" into lmp-docs 
* commit 'ca14e6c8326136686d3de796f1fcd7eb2b5aebe3':
  docs: studio index typo
 2015-01-07 09:22:58 +00:00
Joe Fernandez
76094382cf am c6fe54ed: am 62c3abe7: am acb35e19: Merge "docs: studio bundle checksum update" into lmp-docs 
* commit 'c6fe54ed869d270533f6a3cf6ddea1e10d83afcc':
  docs: studio bundle checksum update
 2015-01-07 09:22:53 +00:00