Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
123,545 Commits 3 Branches 0 Tags
a487fb77dff1a86fbd160694de41e32b74f10cb1
Commit Graph

36352 Commits

Author SHA1 Message Date
Justin Koh
618f30db3e Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGE 
Hide getRequiredPermission in android.hardware.Sensor.
Bug: 14116162

Change-Id: I1e5c8361f6d0710c5da78d9506f70fa40a814b92
 2014-05-05 14:51:55 -07:00
Justin Koh
1aa59f86ca Hide getDeviceGlobalActionKeyTimeout 
Hide getDeviceGlobalActionKeyTimeout, as requested. Remove mention from
@deprecated notice.
Bug: 14441321

Change-Id: Ic6e84e718c2eaa15a86d8cd4d13645be88490b61
 2014-05-05 14:40:56 -07:00
Craig Mautner
9bb4df3a7d am e88097bd: Merge "Pause and resume ActivityView when visibility changes" into klp-modular-dev 
* commit 'e88097bd00d5710bbfb6c24a934743c8d6cac9cf':
  Pause and resume ActivityView when visibility changes
 2014-05-05 21:03:39 +00:00
Craig Mautner
d13a558397 Pause and resume ActivityView when visibility changes 
Once a Surface has been established the activity in an ActivityView
must be paused and resumed as the view goes in and out of visibility
= View.GONE.

Fixes bug 14034658.

Change-Id: Icab43678053c225db70f051dceacd4d024df2153
 2014-05-05 12:07:40 -07:00
Vinod Krishnan
8afb23cbf6 Adding a HeartRate Feature 
Bug: 14140142

Change-Id: I080bf12995355eac7621ef46e1a4a64d1f865500
 2014-05-05 11:53:28 -07:00
Justin Koh
9abf0b9031 am 60158445: Merge "Make global action key timeout configurable." into klp-modular-dev 
* commit '6015844578dc4d725c7ab3d3004d18ffea446087':
  Make global action key timeout configurable.
 2014-05-02 17:28:53 +00:00
Justin Koh
6015844578 Merge "Make global action key timeout configurable." into klp-modular-dev 2014-05-02 17:25:50 +00:00
Justin Koh
feabd2c730 Make global action key timeout configurable. 
Make global action key timeout configurable: deprecated the old public method
and created a new one: getDeviceGlobalActionKeyTimeout.
Bug: 14441321

Change-Id: Ifa9b136984a9f02cfe4040baeff11275174967c5
 2014-05-02 10:04:34 -07:00
Mark Renouf
63f728065a am 11b14691: Implement cliff guard for swipeDismiss gesture 
* commit '11b1469144d73ad0280ef9d0c2e478d180f17074':
  Implement cliff guard for swipeDismiss gesture
 2014-05-02 16:45:34 +00:00
Mark Renouf
11b1469144 Implement cliff guard for swipeDismiss gesture 
BUG: 14319825

Change-Id: I6a80c91b4a6ee2eaf49a8c0c69065d4b97d7f8f2
 2014-05-02 01:56:54 +00:00
Jeff Brown
4f8cd18880 am 7f6ab17d: Merge "Clean up some terminology related to interactive state." into klp-modular-dev 
* commit '7f6ab17d414726868563105cd995b37dd519320b':
  Clean up some terminology related to interactive state.
 2014-05-01 23:29:13 +00:00
Jeff Brown
140ffc783c Clean up some terminology related to interactive state. 
Change-Id: Ife4445685a5314dea64332a3490fa8dd3ffd89a2
 2014-05-01 15:22:27 -07:00
Mindy Pereira
ed7e36dc2e am d5e92318: Merge "Update fling min velocity" into klp-modular-dev 
* commit 'd5e92318b69d8af6d91dc3b51738913595e0f536':
  Update fling min velocity
 2014-05-01 20:40:08 +00:00
Narayan Kamath
3a951e52d9 resolved conflicts for merge of 69da8a12 to klp-modular-dev-plus-aosp 
Change-Id: Ie07b88f324749afcf8417b50d4dbbc6e2a271a2a
 2014-05-01 15:32:20 +01:00
Narayan Kamath
69da8a124e am 2a9a0471: Merge "Package manager changes for dual zygote stack." 
* commit '2a9a047140b8da8f9cd7147c8bed60eeb61d1b6a':
  Package manager changes for dual zygote stack.
 2014-05-01 14:00:43 +00:00
Narayan Kamath
0338af46f9 am 99253c2d: am fde59428: Merge "Handle /oem and /vendor as well" 
* commit '99253c2da945cbd4725efced6cac2dc40c858d6c':
  Handle /oem and /vendor as well
 2014-05-01 13:57:21 +00:00
Narayan Kamath
6af42aea72 am 9f34234f: am b916d8ad: Merge "Implement FileUtils#contains." 
* commit '9f34234f1c0e39ee43c4a86e23d333ba2a30ec0e':
  Implement FileUtils#contains.
 2014-05-01 13:57:13 +00:00
Narayan Kamath
0349e8c478 Package manager changes for dual zygote stack. 
- Pass down the app's instruction set to dexopt so that
  it can compile the dex file for the right architecture.

- Also pass down the app's instruction set to rmdex, movedex
  and getSize so that they can construct the cache file
  location properly.

- Temporarily compile "system" jars such as am,wm etc. for
  both architectures. A follow up change will ensure that
  they're compiled only for one architecture (the same
  arch. as the system server).

- Java "shared" libraries are now compiled for the right
  architecture when an app requires them.

- Improve the app native library ABI detection to account
  for system apps installed in /system/lib{64}/<packagename>
  and also handle sdcard and forward locked apps correctly.

(cherry-picked from commit b4d35dc8e9702f9d0d82d35a105f0eea35672b52)
 2014-05-01 13:54:48 +00:00
Narayan Kamath
99253c2da9 am fde59428: Merge "Handle /oem and /vendor as well" 
* commit 'fde594288bff0b8f95567e6b27f273f50f0c5f87':
  Handle /oem and /vendor as well
 2014-05-01 13:53:08 +00:00
Narayan Kamath
9f34234f1c am b916d8ad: Merge "Implement FileUtils#contains." 
* commit 'b916d8adffd7ea3588bc178e1ee03f68f0a409e5':
  Implement FileUtils#contains.
 2014-05-01 13:52:55 +00:00
Christopher Tate
c84471c2e0 Handle /oem and /vendor as well 
Bug 13170859

(cherry-picked from commit 740888f62e)

Change-Id: I7b5e206697fcbec146cac6cd83fca5c583a8cbd7
 2014-05-01 13:51:33 +00:00
Narayan Kamath
d6d1dbac3f Implement FileUtils#contains. 
Partial cherry-pick of changes 4ca728c0 and 21de56a9, which
can't be cherry-picked due to their large surface area.

Change-Id: Ife46e150d360cd5241dea93863141749233c1805
 2014-05-01 14:01:44 +01:00
Mindy Pereira
23ffc73abd Update fling min velocity 
Make it configurable for watch

Change-Id: Icf90ebd5bd5924fb2a5beb6715479d5dbe7e7dd9
 2014-04-30 17:17:10 -07:00
Michael Wright
474b07497b am 809c3698: am 54c3529b: Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent" 
* commit '809c369892ddbae908dc47e6a1032a768e9004cb':
  WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent
 2014-04-30 19:11:05 +00:00
Michael Wright
809c369892 am 54c3529b: Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent" 
* commit '54c3529b4d3f86488799caa0e62a1f3929a79a39':
  WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent
 2014-04-30 19:06:40 +00:00
Michael Wright
54c3529b4d Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent" 2014-04-30 19:02:56 +00:00
Allen Shen
1c0f21ea84 WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent 
Originally the api 'getCropAndSetWallpaperIntent' does not check
whether the parsed parameter is a NULL pointer, as leads to the
whole app crash if it call this api with a null parameter accidentally.
A null pointer check logic is added into its original parameter check
logic, so that this API will throw an IllegalArgumentException if it
is parsed with a null pointer

Change-Id: Ib7de40e571419d09e1a744edc969eb7162766b75
 2014-04-30 17:09:19 +08:00
Bill Yi
d21082ca0c am 9a76e9ba: Fix build error 
* commit '9a76e9ba1adbdf7cc431b1e6fe454cf0c5d900de':
  Fix build error
 2014-04-30 01:55:23 +00:00
Bill Yi
9a76e9ba1a Fix build error 
Change-Id: I6f52954a780b747f1ad2a4e429ef192d58c40e76
 2014-04-29 18:52:48 -07:00
Bill Yi
293513a59d Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD 2014-04-29 16:07:29 -07:00
Bo Liu
02931d9af6 DO NOT MERGE Add invokeFunctor stub 
Change-Id: Ib7637d68c4f63065b909075a8f5d8cd1dd0674bd
 2014-04-29 11:38:37 -07:00
Elliott Hughes
45641ecd2c am 7af8f5ba: am 10d57c4b: Merge "Fix two zygote imports." 
* commit '7af8f5ba9cc7801fabe70bcf13e602aaa73dc428':
  Fix two zygote imports.
 2014-04-29 04:05:25 +00:00
Elliott Hughes
a9569ff70f Fix two zygote imports. 
Change-Id: I5eea2d9f48479c33e1594aaa259274e5e787a1df
 2014-04-28 20:53:52 -07:00
Elliott Hughes
3e792ef78f am fff28619: am f4a7ac00: Merge "Move the Zygote off libcore.os and onto android.system." 
* commit 'fff28619d8f3b2fa7577c3e101d3fcd45f26f3a4':
  Move the Zygote off libcore.os and onto android.system.
 2014-04-29 02:34:37 +00:00
Elliott Hughes
860c5911a2 Move the Zygote off libcore.os and onto android.system. 
Change-Id: Iaa20e50b05fad355bdf15bcfdc58efc9941c400c
 2014-04-28 19:19:13 -07:00
Yuling Liang
3914a33c01 am 26a5c2dd: Merge "Followon fix for 14276128 Clipping at bottom of TextView" into klp-modular-dev 
* commit '26a5c2dd740f309f3168790fc55a164738963835':
  Followon fix for 14276128 Clipping at bottom of TextView
 2014-04-28 23:18:58 +00:00
Yuling Liang
26a5c2dd74 Merge "Followon fix for 14276128 Clipping at bottom of TextView" into klp-modular-dev 2014-04-28 23:16:13 +00:00
Griff Hazen
e638b84436 am 3c5a6cf9: am 2c6131bb: am 293977bd: Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE. 
* commit '3c5a6cf93520be23e6d5a9bc4cb8f4e8c18214b1':
  Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
 2014-04-28 20:37:24 +00:00
Griff Hazen
3c5a6cf935 am 2c6131bb: am 293977bd: Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE. 
* commit '2c6131bba957dc5b4e1638bb8b0c10ebddf2049a':
  Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
 2014-04-28 20:33:22 +00:00
Adam Lesinski
734a78fb86 am 8ea2d451: Merge "Various CTS fixes" into klp-modular-dev 
* commit '8ea2d4512248ec612356f558ac35534c3e4c6db6':
  Various CTS fixes
 2014-04-28 20:33:09 +00:00
Adam Lesinski
8ea2d45122 Merge "Various CTS fixes" into klp-modular-dev 2014-04-28 20:30:35 +00:00
Griff Hazen
2c6131bba9 am 293977bd: Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE. 
* commit '293977bdb028e2aa893fbeb370e20132646094a9':
  Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
 2014-04-28 20:29:12 +00:00
Elliott Hughes
3ce4f3d0af am 685a0a72: am bbd87eb9: Merge "Track libcore.os\' move to android.system." 
* commit '685a0a72d445515167a2071330679cdf9b53a62d':
  Track libcore.os' move to android.system.
 2014-04-28 18:36:53 +00:00
Mathieu Chartier
c6d0dc8964 am 18582a82: am 0cd623bb: Merge "Use Runtime.gc instead of System.gc for DDMS." 
* commit '18582a827c3f908cd75e1d9c189c554f42415a4a':
  Use Runtime.gc instead of System.gc for DDMS.
 2014-04-28 18:36:44 +00:00
Elliott Hughes
bbd87eb919 Merge "Track libcore.os' move to android.system." 2014-04-28 18:14:00 +00:00
Elliott Hughes
34385d352d Track libcore.os' move to android.system. 
(This is partial, but should cover everything in AOSP master except
for the zygote.)

Change-Id: I1042c99245765746a744c44e714095cb2c6cb75d
 2014-04-28 11:11:32 -07:00
Mathieu Chartier
83f7d0d67f Use Runtime.gc instead of System.gc for DDMS. 
System.gc doesn't always do a GC unless to attempt to run the
finalizers after you call System.gc.

Bug: 14325353
Change-Id: Iebed7fad5576d610cea13a86e7d3d46652c67478
 2014-04-28 11:07:22 -07:00
Raph Levien
d97b097a5b Followon fix for 14276128 Clipping at bottom of TextView 
The previous fix did not work when the text was ellipsized, because the
test for whether the line was the last line was incorrect. The new test
handles both the end of the buffer and the case where it is the last
line because of ellipsizing.

So this should be the proper fix for bug 14276128 Clipping at bottom of
TextView when lineSpacingMultiplier < 1

This version of the patch also handles the single-line case (which is
computed in BoringLayout rather than StaticLayout).

Change-Id: I88791acc2aa493cc8c599b374f4d213571260b4b
 2014-04-28 18:02:27 +00:00
Griff Hazen
293977bdb0 Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE. 
The logic was opposite.

Change-Id: I62e0b1e6701a4c9990119a1b94918e64783e9b1a
 2014-04-28 10:32:21 -07:00
Mark Salyzyn
a19b9c413b am dfdeabf9: am ac732708: Merge "EventLog: event log translation errors" 
* commit 'dfdeabf9ba40ea7f082acf7eba6fe086d2e643fb':
  EventLog: event log translation errors
 2014-04-25 22:07:07 +00:00