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

172668 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
169c11dd39 Merge "Add missing DateFormat method." into lmp-mr1-dev 2015-01-08 01:17:32 +00:00
Deepanshu Gupta
565b6b415a Merge "Update platform.dir search in tests." into lmp-mr1-dev 2015-01-08 01:17:23 +00:00
Jeff Sharkey
bcba21827c Merge "check ntpserver as empty string instead of null" automerge: dbcb4a1 
automerge: 387da77

* commit '387da7769757ab6368acb2a0000cd8a85d3e55d8':
  check ntpserver as empty string instead of null
 2015-01-08 01:03:49 +00:00
Jeff Sharkey
387da77697 Merge "check ntpserver as empty string instead of null" 
automerge: dbcb4a1

* commit 'dbcb4a16d4c91d960359fbdb8c6f1d72a4daca9e':
  check ntpserver as empty string instead of null
 2015-01-08 00:59:56 +00:00
Jeff Sharkey
dbcb4a16d4 Merge "check ntpserver as empty string instead of null" 2015-01-08 00:57:43 +00:00
Young-Ho Cha
0eda7dfcac check ntpserver as empty string instead of null 
mServer cannot set null, because string from resource always returns
non-null charsequence

Change-Id: I8d6a6fdbc34267ee361e7bd20719887268161870
Signed-off-by: Young-Ho Cha <ganadist@gmail.com>
 2015-01-08 09:34:01 +09:00
Deepanshu Gupta
1330f79f95 Replace java.util.LinkedHashMap.eldest() 
Provide an alternate implementation for the above method and replace the
calls to it, since the method is not available on host VM.

Change-Id: I329d86b457d1859b137da8fb2790ddd7f8efa788
 2015-01-07 16:32:21 -08:00
Deepanshu Gupta
5df729ad09 am a98a9b30: am d8e99c58: am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev automerge: 0b1188e 
* commit 'a98a9b30bea74478b9d1b3f16e3713f5c864e648':
  Fix tests on jenkins, take 2.
 2015-01-08 00:03:58 +00:00
Joe Fernandez
04b30fa00b am ec5f5934: am 97b7b863: am d385640f: am 491a8257: docs: Update Dashboard for January 2015 automerge: 0e13957 
* commit 'ec5f5934153557e85c1a001e713b963b79d18388':
  docs: Update Dashboard for January 2015
 2015-01-08 00:03:52 +00:00
Deepanshu Gupta
a98a9b30be am d8e99c58: am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev automerge: 0b1188e 
* commit 'd8e99c5861b09de8f709c9284240e2c3115507bb':
  Fix tests on jenkins, take 2.
 2015-01-07 23:57:59 +00:00
Joe Fernandez
ec5f593415 am 97b7b863: am d385640f: am 491a8257: docs: Update Dashboard for January 2015 automerge: 0e13957 
* commit '97b7b8637bc50cbcd9ad9a63fcb34355439b0701':
  docs: Update Dashboard for January 2015
 2015-01-07 23:57:54 +00:00
Deepanshu Gupta
d8e99c5861 am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev 
automerge: 0b1188e

* commit '0b1188e3c1ff6c814dc64c51c83b19afa36d8ce9':
  Fix tests on jenkins, take 2.
 2015-01-07 23:53:09 +00:00
Joe Fernandez
97b7b8637b am d385640f: am 491a8257: docs: Update Dashboard for January 2015 
automerge: 0e13957

* commit '0e13957a4deab3a90492d9ae2f6d35d3b5c1773e':
  docs: Update Dashboard for January 2015
 2015-01-07 23:51:33 +00:00
Christopher Tate
e04518866e am 413ec4a6: am bee49807: Merge "Support single-package backup rejection by the transport" into lmp-mr1-dev 
* commit '413ec4a6573ffa88bf02a796eb8c9dc7dfa839ca':
  Support single-package backup rejection by the transport
 2015-01-07 23:30:34 +00:00
Christopher Tate
413ec4a657 am bee49807: Merge "Support single-package backup rejection by the transport" into lmp-mr1-dev 
* commit 'bee49807dde9f19d5163e87b71fe17392bfe857c':
  Support single-package backup rejection by the transport
 2015-01-07 23:23:14 +00:00
Christopher Tate
bee49807dd Merge "Support single-package backup rejection by the transport" into lmp-mr1-dev 2015-01-07 23:19:50 +00:00
Andres Morales
1ce7d179bf Wipe FRP partition if OEM unlock enabled 
Not all devices invoke recovery on every userdata wipe,
so we can't rely on code in the
recovery OS to do this. This results in fastboot -w
not properly wiping the FRP partition. This patch
fixes the issue by having the framework level service
check the OEM unlock enabled bit, and wiping the partition
if it is set.

Bug: 18644051
Change-Id: Id97a29916fe39561700912a920c5741109842bdb
 2015-01-07 14:46:19 -08: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
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
Dianne Hackborn
ab2df067fc Add new debug feature to track associations between processes. Also 
add some debugging for spurious service ANRs.

Bug: 18201239
Change-Id: Icd43f35c696d71453e1d4deea855984b2d14b347
 2015-01-07 14:01:13 -08: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
Deepanshu Gupta
6aede34e24 Add missing DateFormat method. 
Change-Id: Ia03023e65ef4a7ec90b61f1f538cbe74868c63c5
 2015-01-07 12:26:31 -08:00
Deepanshu Gupta
0359b4b199 Update platform.dir search in tests. 
The tests search for a built sdk using some heuristics. The default path
of the built sdk has changed now, and this updates the search
accordingly.

Change-Id: I36d465d8c5f6cfd971bbdf95878fb144de233c6c
 2015-01-07 12:21:59 -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
Deepanshu Gupta
0b1188e3c1 am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev 
* commit '3bd33f1d9e8af826fa95095ca391d40f6c75ca2a':
  Fix tests on jenkins, take 2.
 2015-01-07 19:46:03 +00:00
Deepanshu Gupta
3bd33f1d9e Merge "Fix tests on jenkins, take 2." into lmp-dev 2015-01-07 19:29:40 +00:00
Deepanshu Gupta
d657b14927 Fix tests on jenkins, take 2. 
Change-Id: I67386c34a7abd7c3afdf9f0768f36f4786399be0
 2015-01-07 11:22:22 -08: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