Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,910 Commits 3 Branches 0 Tags
4e7500e10cf10eb697bb3e916bf705b9db470c8f
Commit Graph

48013 Commits

Author SHA1 Message Date
Wale Ogunwale
cc9c597dad am d639a453: am e60077e6: Merge "Revert "[ActivityManager] Improve multi-thread access the same provider"" 
* commit 'd639a4532417bf605f03b3b5efdb3a9e1cbe6661':
  Revert "[ActivityManager] Improve multi-thread access the same provider"
 2015-04-24 22:26:08 +00:00
Wale Ogunwale
4cdc7e842d am e2047da6: am d9bf2652: Merge "Revert "Clean-up state if we have an exception when acquiring provider"" 
* commit 'e2047da6f3f21fc702d35b7d1c4e9bb62c963dac':
  Revert "Clean-up state if we have an exception when acquiring provider"
 2015-04-24 22:26:04 +00:00
Wale Ogunwale
d639a45324 am e60077e6: Merge "Revert "[ActivityManager] Improve multi-thread access the same provider"" 
* commit 'e60077e62a441dbcc132b2abb35d998ab48d261c':
  Revert "[ActivityManager] Improve multi-thread access the same provider"
 2015-04-24 22:15:02 +00:00
Wale Ogunwale
e2047da6f3 am d9bf2652: Merge "Revert "Clean-up state if we have an exception when acquiring provider"" 
* commit 'd9bf26522b930a8d5d25f6e28c390e39fee6d0b2':
  Revert "Clean-up state if we have an exception when acquiring provider"
 2015-04-24 22:14:56 +00:00
Wale Ogunwale
1d646128b2 Revert "[ActivityManager] Improve multi-thread access the same provider" 
This reverts commit 57307b21cb.

Bug: 20091132
 2015-04-24 14:45:14 -07:00
Wale Ogunwale
67fe0a450c Revert "Clean-up state if we have an exception when acquiring provider" 
This reverts commit 73e239bdc9.

Bug: 20091132
 2015-04-24 14:44:54 -07:00
Mark Renouf
f237bce8c3 am 99d49300: am 55555a3d: Fixes rejected dismiss gestures (framework version of ag/677161) 
* commit '99d4930064e7d155ce92746028cbafd46b14c6f4':
  Fixes rejected dismiss gestures (framework version of ag/677161)
 2015-04-24 17:42:01 +00:00
Mark Renouf
99d4930064 am 55555a3d: Fixes rejected dismiss gestures (framework version of ag/677161) 
* commit '55555a3dab1f3b99a3299b90851624e9dc10f3cc':
  Fixes rejected dismiss gestures (framework version of ag/677161)
 2015-04-24 17:31:31 +00:00
Mark Renouf
55555a3dab Fixes rejected dismiss gestures (framework version of ag/677161) 
Gus's original change description:

This change modifies the logic in SwipeDismissLayout which determines
whether or not a gesture should be interpreted as a dismiss
gesture.

Previously, on the first touch move event, the gesture was classified
as a dismiss gesture if the X movement exceeded the touch slop
and the Y movement did not.  At this point the gesture was not
intercepted and the underlying widget (in the case of the cue
card, the GridViewPager) received all subsequent move events.

In the case of a very fast gesture at a slight vertical angle, it was
easy for the total Y movement to exceed the touch slop.
This change only rejects the gesture if the Y movement exceeds
the X movement, which is consistent with how GridViewPager
distinguishes horizontal vs. vertical swipes.
This change also cancels the dismissal if the end of the gesture
is a leftwards flight.

BUG: 20542762

(Same as b/20350515 but for Activity dismissal at the system level.)

Change-Id: I6e3fb646c42dda0d1c1f5552d91b27c6374fc08c
 2015-04-24 11:47:27 -04:00
Svet Ganov
2fd6dda03e am f33489c6: am d24cc193: am db672b6c: am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev 
* commit 'f33489c6bda49cf930cb06601625ddf792d41fe7':
  DO NOT MERGE Don't take flags when creating app widget config activity.
 2015-04-23 22:19:04 +00:00
Joe Fernandez
1009c8de23 am 92ae292e: Merge "docs: Add text to JavaDocs regarding browser file access vulnerability" into lmp-mr1-ub-docs 
* commit '92ae292e864287abcb1a78c117263f64b303b885':
  docs: Add text to JavaDocs regarding browser file access vulnerability
 2015-04-23 17:45:19 +00:00
Svet Ganov
f33489c6bd am d24cc193: am db672b6c: am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev 
* commit 'd24cc19343073294b3376f825bdc0d54a8d692f1':
  DO NOT MERGE Don't take flags when creating app widget config activity.
 2015-04-23 15:43:01 +00:00
Svet Ganov
d24cc19343 am db672b6c: am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev 
* commit 'db672b6cde256e27c1188c7e99f23e5a65252ba4':
  DO NOT MERGE Don't take flags when creating app widget config activity.
 2015-04-23 15:30:43 +00:00
Svet Ganov
db672b6cde am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev 
* commit '00e91901fd1dd007de196ada04e3fc2f79e1be73':
  DO NOT MERGE Don't take flags when creating app widget config activity.
 2015-04-23 15:18:10 +00:00
Joe Fernandez
22b5ba8c01 docs: Add text to JavaDocs regarding browser file access vulnerability 
b/17420682

Change-Id: Ic03b51778280570be65ae933fd906b140acdf023
 2015-04-22 17:29:12 -07:00
Justin Koh
ba75135a80 am 2aa3905c: Merge "DO NOT MERGE: The ValueAnimator\'s state need to be totally reset during clone." into lmp-mr1-modular-dev 
* commit '2aa3905cb0cc595783ab43b0bc7a4b3818003958':
  DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone.
 2015-04-22 00:43:16 +00:00
ztenghui
059451e185 am 23606598: DO NOT MERGE: Reset the Node status when clone. 
* commit '23606598244c2a297d994895eaf631b240d33242':
  DO NOT MERGE: Reset the Node status when clone.
 2015-04-22 00:43:08 +00:00
Justin Koh
2aa3905cb0 Merge "DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone." into lmp-mr1-modular-dev 2015-04-22 00:31:00 +00:00
Andreas Gampe
fb861b6c8d am 31fb202e: Merge "Frameworks/base: Compile-time optimize SQLiteConnection" 
* commit '31fb202e6f6687f86ec4fc33b18aafacbf67c797':
  Frameworks/base: Compile-time optimize SQLiteConnection
 2015-04-21 23:59:57 +00:00
Andreas Gampe
31fb202e6f Merge "Frameworks/base: Compile-time optimize SQLiteConnection" 2015-04-21 23:31:51 +00:00
Mathieu Chartier
765d7c3048 am ba6783b6: Merge "Update getExportedPropertyMethods to new reflection API" 
* commit 'ba6783b69a34b05123d1e3da51e6a11a9e0ca115':
  Update getExportedPropertyMethods to new reflection API
 2015-04-21 23:26:49 +00:00
Andreas Gampe
c7f9f7656f am 189d2785: Merge "Frameworks/base: Fix comment" 
* commit '189d2785c3b71eac9c122c874586501a2ab723b2':
  Frameworks/base: Fix comment
 2015-04-21 23:26:41 +00:00
Mathieu Chartier
ba6783b69a Merge "Update getExportedPropertyMethods to new reflection API" 2015-04-21 23:03:35 +00:00
Andreas Gampe
4f47b40e05 Frameworks/base: Compile-time optimize SQLiteConnection 
Do not cache compiled regular expression and date formatter. Both
cannot be compile-time created, are expensive at preloading time,
and only used in the rare case of dumping the connection (mainly
on errors).

Bug: 19498458
Bug: 19542228
Change-Id: Ia38491a3f852ccf699b815ff05289b338e932f2a
 2015-04-21 16:01:00 -07:00
ztenghui
612e5cdec6 DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone. 
b/20119270

Change-Id: I26365b38e4a9712227aaec6f08f32025dab82ac7
(cherry picked from commit 26e9a19900)
 2015-04-21 21:26:53 +00:00
ztenghui
2360659824 DO NOT MERGE: Reset the Node status when clone. 
b/20457797

Change-Id: I5f1b0e2238fdc4a69a9c09c1e6e0272f7ede3685
 2015-04-21 20:31:58 +00:00
Mathieu Chartier
a8a6516f62 Update getExportedPropertyMethods to new reflection API 
Bug: 19264997

Change-Id: Ife79c469fdb09f30e3aefcfc3e0ce5ed32303fce
 2015-04-21 11:52:10 -07:00
Andreas Gampe
dd8e5fbe96 Frameworks/base: Fix comment 
Fix comment in ZygoteInit.

Change-Id: I853581c8d44ee52ee8e113c67ea68621643ecb39
 2015-04-21 09:01:51 -07:00
Andreas Gampe
1f4f92ed74 am b6feabcf: Merge "Frameworks/base: Use better Class.forName in ZygoteInit" 
* commit 'b6feabcfce080c2dc906434cf05ff606489cf39d':
  Frameworks/base: Use better Class.forName in ZygoteInit
 2015-04-21 04:26:53 +00:00
Andreas Gampe
c917f74d92 Frameworks/base: Use better Class.forName in ZygoteInit 
Use the three-argument version of Class.forName. This saves an
expensive stack lookup for the caller's class-loader on each
invocation.

Bug: 19498458
Change-Id: I859affde31e580fd2de3f70ee0a9295936c2d9f4
 2015-04-20 19:17:54 -07:00
Kris Giesing
6c97440849 DO NOT MERGE Revert "Load libraries directly from apk" 
This reverts commit dec4688f40.

Change-Id: Ief869dec1641d5a376bc044719941536e0bf8442
 2015-04-20 14:15:59 -07:00
Kris Giesing
e863712afc DO NOT MERGE Revert "Add android.net.IpPrefix#contains()" 
This reverts commit acc8c09d3a.

Change-Id: I3c11ddd66d22ab2756201b489127f1643fedb429
 2015-04-20 14:15:43 -07:00
Svet Ganov
68e6b5055b DO NOT MERGE Don't take flags when creating app widget config activity. 
bug:19618745

Change-Id: I7973ebfc67ebf52f14890dda9eb891a7b8a5a095
 2015-04-20 17:16:38 +00:00
Martijn Coenen
cb4776254c am e386f7f5: Merge "Expose peer LLCP version in NDEF callbacks." 
* commit 'e386f7f5108e9c2aa7547394f23d5936d7993cfe':
  Expose peer LLCP version in NDEF callbacks.
 2015-04-17 07:25:27 +00:00
Martijn Coenen
e386f7f510 Merge "Expose peer LLCP version in NDEF callbacks." 2015-04-17 07:02:59 +00:00
Filip Gruszczynski
47e743b9e2 am 4544b927: Hold a wake lock while dozing when wallpaper draws. 
* commit '4544b927d7f3575bf609490b42d521a12bf95a07':
  Hold a wake lock while dozing when wallpaper draws.
 2015-04-17 00:59:39 +00:00
Chad Brubaker
a9d740003f am e5e49a17: Merge "Support KM_LONG_REP" 
* commit 'e5e49a175c27b95d6b8928ab435bfde9f9db3c81':
  Support KM_LONG_REP
 2015-04-16 22:23:29 +00:00
Filip Gruszczynski
4544b927d7 Hold a wake lock while dozing when wallpaper draws. 
This mimics what ViewRootImpl does before drawing.

Bug: 20242788
Change-Id: If85ad17113636f74267aedb3af04d0281b57ac0e
 2015-04-16 15:00:58 -07:00
Chad Brubaker
e5e49a175c Merge "Support KM_LONG_REP" 2015-04-16 21:56:13 +00:00
Chad Brubaker
b543b39354 Support KM_LONG_REP 
Change-Id: I37814bcb03dc8918e27226ec43230fa4218723d0
 2015-04-16 14:39:51 -07:00
Alex Klyubin
51884f0e06 am 499126c4: Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant." 
* commit '499126c43385ba7bce9b8547b61bafd0c6311147':
  Add Keymaster KM_ORIGIN_UNKNOWN constant.
 2015-04-16 20:09:05 +00:00
Alex Klyubin
499126c433 Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant." 2015-04-16 19:50:12 +00:00
Alex Klyubin
a2607ee4eb am b9a78c79: Merge "Add IV-related Keymaster error codes." 
* commit 'b9a78c7939e9b31c807106166cafe65dc5af777d':
  Add IV-related Keymaster error codes.
 2015-04-16 16:57:12 +00:00
Alex Klyubin
37d81d035c Add IV-related Keymaster error codes. 
Bug: 18088752
Change-Id: I08daede713f945ad7dd0b21cc41ee12c15d94bad
 2015-04-15 17:18:19 -07:00
Martijn Coenen
fd70bb1367 Expose peer LLCP version in NDEF callbacks. 
Change-Id: I98b9a9764b66345f842c1f845c8a386161d965f5
 2015-04-15 12:33:37 +02:00
Martijn Coenen
895f3c2726 am 6a47a861: Merge "Add getPrefixAids()." 
* commit '6a47a86112e271d200f77d5ec66f5f50979135ca':
  Add getPrefixAids().
 2015-04-15 09:37:56 +00:00
Martijn Coenen
6a47a86112 Merge "Add getPrefixAids()." 2015-04-15 08:00:13 +00:00
Martijn Coenen
ed3a29ea08 Add getPrefixAids(). 
Bug: 19144664
Change-Id: Ia49550102ccf1d40cd3f2bf7e5bd64d444a2e8a3
 2015-04-15 09:48:57 +02:00
Hiroshi Yamauchi
d83a598c39 am 82992b72: Merge "Fix javadoc error in Debug.getRuntimeStats()." 
* commit '82992b7270842637d1af3dcc7c9ae954bdfa312c':
  Fix javadoc error in Debug.getRuntimeStats().
 2015-04-15 00:11:01 +00:00
Hiroshi Yamauchi
d8001676ea Fix javadoc error in Debug.getRuntimeStats(). 
Bug: 19825248
Change-Id: Id7131732d30f01c3edd01c6d4c7c391095ffd054
 2015-04-14 16:08:49 -07:00