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

111698 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
satok
4989aca7cb am da85cded: (-s ours) am 9e104087: DO NOT MERGE. Fix test breakage 
* commit 'da85cded35404a3eda26524dba07030c9f374112':
  DO NOT MERGE. Fix test breakage
 2013-08-23 04:47:42 -07:00
satok
da85cded35 am 9e104087: DO NOT MERGE. Fix test breakage 
* commit '9e104087978553f43fcb7767ff2ee265dbd15d2c':
  DO NOT MERGE. Fix test breakage
 2013-08-23 04:45:39 -07:00
satok
9e10408797 DO NOT MERGE. Fix test breakage 
Change-Id: I0b2b7ce4b9f50910b4795cb480aa86a662b16f7d
 2013-08-23 20:08:15 +09:00
satok
af71b1a342 Merge "Fix test breakage" 2013-08-23 11:07:21 +00:00
satok
85cac210dd Fix test breakage 
Change-Id: I0b2b7ce4b9f50910b4795cb480aa86a662b16f7d
 2013-08-23 19:59:50 +09:00
Satoshi Kataoka
3d3e04eb04 am c60d6ab8: am d866f500: Merge "Add new API shouldOfferSwitchingToNextInputMethod" into klp-dev 
* commit 'c60d6ab8256e2a11ea82773fcbd914dc2dda0b11':
  Add new API shouldOfferSwitchingToNextInputMethod
 2013-08-23 02:35:56 -07:00
Satoshi Kataoka
c60d6ab825 am d866f500: Merge "Add new API shouldOfferSwitchingToNextInputMethod" into klp-dev 
* commit 'd866f5002aef29de5cde0e3b5e84ed3992214916':
  Add new API shouldOfferSwitchingToNextInputMethod
 2013-08-23 02:33:26 -07:00
Satoshi Kataoka
d866f5002a Merge "Add new API shouldOfferSwitchingToNextInputMethod" into klp-dev 2013-08-23 09:31:51 +00:00
Chris Craik
23bf0e5790 Add cleanspec for bitmap jni issue 
Change-Id: I0b270a8c1edd28a305e014ad7b0039f56787b25a
 2013-08-22 22:15:25 -07:00
Jeff Brown
e181003a51 am 026ef5c4: am 5bc1ea4e: Merge "Drop touch events when no window was touched." into klp-dev 
* commit '026ef5c4dea629c233fee129167cecf47b4a14ee':
  Drop touch events when no window was touched.
 2013-08-22 20:13:58 -07:00
Jeff Brown
026ef5c4de am 5bc1ea4e: Merge "Drop touch events when no window was touched." into klp-dev 
* commit '5bc1ea4e4ae0133d4d5eaa4ac98cf4719effd032':
  Drop touch events when no window was touched.
 2013-08-22 20:11:54 -07:00
Jeff Brown
5bc1ea4e4a Merge "Drop touch events when no window was touched." into klp-dev 2013-08-23 03:08:41 +00:00
Jeff Brown
0b31d812ab Drop touch events when no window was touched. 
Prevent spurious ANRs in the case where an input event is simply
undeliverable because there is no window at the touched location.
Previously, we would assume that we were just waiting for an
application to start and become available to handle the event but
this assumption is no longer valid.

Monkeys in particular have a tendency to inject events outside
of the boundaries of the display which results in spurious ANRs.
So we should just reject them.

Bug: 9774124
Change-Id: I5c40ce4c942f0557593a229dc5253a0e0bdb8466
 2013-08-22 20:07:08 -07:00
Jeff Brown
951cdbf729 am f825d11b: (-s ours) am ec7a6330: Merge "Remove input flinger stubs. (DO NOT MERGE)" into klp-dev 
* commit 'f825d11bb862999e51422b6bf332166a0584d4ee':
  Remove input flinger stubs.  (DO NOT MERGE)
 2013-08-22 19:36:04 -07:00
Jeff Brown
f825d11bb8 am ec7a6330: Merge "Remove input flinger stubs. (DO NOT MERGE)" into klp-dev 
* commit 'ec7a633086b3fcc7067d0e37baeda69880969e13':
  Remove input flinger stubs.  (DO NOT MERGE)
 2013-08-22 19:34:07 -07:00
Jeff Brown
ec7a633086 Merge "Remove input flinger stubs. (DO NOT MERGE)" into klp-dev 2013-08-23 02:32:36 +00:00
Jeff Brown
7e458235ac Remove input flinger stubs. (DO NOT MERGE) 
Bug: 10446930
Change-Id: I6c9fd490f2efd9c359c598eb2a18c4150b446564
 2013-08-22 19:31:21 -07:00
Scott Main
e3ae481508 am 55e30faa: am 96b4c379: am d17619f6: am cd4e1c46: am f151391b: fix markup errors in action bar styling, add more information about using drawables, move \'managing the activity lifecycle\' down a notch, because it\'s less interesting. 
* commit '55e30faa61eed0c13758b1e41fb53dd1a405f68d':
  fix markup errors in action bar styling, add more information about using drawables, move 'managing the activity lifecycle' down a notch, because it's less interesting.
 2013-08-22 19:06:27 -07:00
Tom O'Neill
d2decbd8eb am fffef620: am ece1320b: Merge "Add a little comment about the enabled value" into klp-dev 
* commit 'fffef62000194be042190c3a8f9b72e11b1afbc7':
  Add a little comment about the enabled value
 2013-08-22 19:06:24 -07:00
Scott Main
55e30faa61 am 96b4c379: am d17619f6: am cd4e1c46: am f151391b: fix markup errors in action bar styling, add more information about using drawables, move \'managing the activity lifecycle\' down a notch, because it\'s less interesting. 
* commit '96b4c3791ba1e92043c89f75919b2f136d33978a':
  fix markup errors in action bar styling, add more information about using drawables, move 'managing the activity lifecycle' down a notch, because it's less interesting.
 2013-08-22 19:03:24 -07:00
Tom O'Neill
fffef62000 am ece1320b: Merge "Add a little comment about the enabled value" into klp-dev 
* commit 'ece1320b86fe058ed673cb900a506d7a3c3fe267':
  Add a little comment about the enabled value
 2013-08-22 19:03:22 -07:00
Scott Main
96b4c3791b am d17619f6: am cd4e1c46: am f151391b: fix markup errors in action bar styling, add more information about using drawables, move \'managing the activity lifecycle\' down a notch, because it\'s less interesting. 
* commit 'd17619f6df6bef8a4a18e02afb0294f75cbd56de':
  fix markup errors in action bar styling, add more information about using drawables, move 'managing the activity lifecycle' down a notch, because it's less interesting.
 2013-08-22 19:01:27 -07:00
Tom O'Neill
ece1320b86 Merge "Add a little comment about the enabled value" into klp-dev 2013-08-23 02:00:28 +00:00
Scott Main
d17619f6df am cd4e1c46: am f151391b: fix markup errors in action bar styling, add more information about using drawables, move \'managing the activity lifecycle\' down a notch, because it\'s less interesting. 
* commit 'cd4e1c463eab530657bead6e79efa3215924f1b0':
  fix markup errors in action bar styling, add more information about using drawables, move 'managing the activity lifecycle' down a notch, because it's less interesting.
 2013-08-22 18:58:56 -07:00
Scott Main
cd4e1c463e am f151391b: fix markup errors in action bar styling, add more information about using drawables, move \'managing the activity lifecycle\' down a notch, because it\'s less interesting. 
* commit 'f151391b72b5ab667ea0681de5bd2fbe0d94d8a9':
  fix markup errors in action bar styling, add more information about using drawables, move 'managing the activity lifecycle' down a notch, because it's less interesting.
 2013-08-22 18:54:35 -07:00
Scott Main
f151391b72 fix markup errors in action bar styling, 
add more information about using drawables,
move 'managing the activity lifecycle' down a notch, because it's less interesting.

Change-Id: I75012207bfaa499ca881ec5cc3a94e8d66addbad
 2013-08-22 18:44:44 -07:00
Michael Wright
3335e39058 am 2be53965: am 0ccb7d11: Merge "Fix check for default source in input command" into klp-dev 
* commit '2be53965a2c1e288dda0866a5805686cd6797f0f':
  Fix check for default source in input command
 2013-08-22 16:41:17 -07:00
Michael Wright
2be53965a2 am 0ccb7d11: Merge "Fix check for default source in input command" into klp-dev 
* commit '0ccb7d117fa13933cb0d7820387e00f3d1aff18d':
  Fix check for default source in input command
 2013-08-22 16:39:23 -07:00
Michael Wright
0ccb7d117f Merge "Fix check for default source in input command" into klp-dev 2013-08-22 23:37:34 +00:00
Jeff Tinker
677e8e51f6 am 2efb6cb7: am 76cf8fe7: Merge "Add ability to test supported content types to MediaDrm" into klp-dev 
* commit '2efb6cb7397b6a2ac634d091f20b3466411f103c':
  Add ability to test supported content types to MediaDrm
 2013-08-22 16:17:16 -07:00
Jeff Tinker
2efb6cb739 am 76cf8fe7: Merge "Add ability to test supported content types to MediaDrm" into klp-dev 
* commit '76cf8fe75e7c1abce9383fb915842f62228a1d91':
  Add ability to test supported content types to MediaDrm
 2013-08-22 16:13:18 -07:00
Jeff Tinker
76cf8fe75e Merge "Add ability to test supported content types to MediaDrm" into klp-dev 2013-08-22 23:08:07 +00:00
Zhijun He
9d7f221012 am a5c98813: am f293627f: Merge "Camera2: Send warning when burst request list is empty" into klp-dev 
* commit 'a5c9881322c3eb36d16a59dac77c833428cef503':
  Camera2: Send warning when burst request list is empty
 2013-08-22 16:05:43 -07:00
Zhijun He
a5c9881322 am f293627f: Merge "Camera2: Send warning when burst request list is empty" into klp-dev 
* commit 'f293627fc2858d8a569b28e8da80047848c961dc':
  Camera2: Send warning when burst request list is empty
 2013-08-22 16:03:01 -07:00
Zhijun He
f293627fc2 Merge "Camera2: Send warning when burst request list is empty" into klp-dev 2013-08-22 22:57:24 +00:00
Michael Wright
2132198d05 Fix check for default source in input command 
Change-Id: I30b062e78c7d4de59a5530999e6332ba3053f7c9
 2013-08-22 15:01:15 -07:00
Zhijun He
fc19e2cfe5 Camera2: Send warning when burst request list is empty 
Bug: 10360518
Change-Id: I4ab89af9ecb62442ce277d0ad7604298534ff7db
 2013-08-22 14:45:24 -07:00
Jose Lima
890875511d am 2acb95a1: am 8f91c33d: Merge "Allow replacing ResolverActivity via config value" into klp-dev 
* commit '2acb95a144f5369a5b16b11e1be3403e223267ba':
  Allow replacing ResolverActivity via config value
 2013-08-22 14:33:29 -07:00
Jose Lima
2acb95a144 am 8f91c33d: Merge "Allow replacing ResolverActivity via config value" into klp-dev 
* commit '8f91c33d8d5cd393107d5fb38e4682a5486e4b50':
  Allow replacing ResolverActivity via config value
 2013-08-22 14:30:51 -07:00
Jose Lima
8f91c33d8d Merge "Allow replacing ResolverActivity via config value" into klp-dev 2013-08-22 21:28:14 +00:00
Tom O'Neill
c8211ea1cc Add a little comment about the enabled value 
Change-Id: I4ac0b864f55992242b6a3b0d8ffb328f23f6b645
 2013-08-22 14:28:12 -07:00
Michael Wright
a027ac5838 am 6d44d8fa: am 8e3a4173: Merge "Expose API to query devices for supported keys" into klp-dev 
* commit '6d44d8fa087f8cfff396df99cd6a7716b5c8bcd2':
  Expose API to query devices for supported keys
 2013-08-22 14:13:19 -07:00
Michael Wright
6d44d8fa08 am 8e3a4173: Merge "Expose API to query devices for supported keys" into klp-dev 
* commit '8e3a41738fba4883f9951406f334567f621db102':
  Expose API to query devices for supported keys
 2013-08-22 14:10:28 -07:00
Michael Wright
8e3a41738f Merge "Expose API to query devices for supported keys" into klp-dev 2013-08-22 21:08:02 +00:00
Jason Monk
da205a749f System binds PAC Local Proxy instead of self start 
The PAC Local Proxy priviously caught proxy broadcasts and started itself
when needed.  Now it is bound by the system the same way the pac processing
service is started.

Bug: 10425091
Change-Id: I746daa21645a11aa18ef464f00c8cb5536d8c86f
 2013-08-22 16:33:26 -04:00
destradaa
4a8e7503d5 am e0b8cf31: am d5deafa4: Merge "Fixes to FlpHal JNI layer." into klp-dev 
* commit 'e0b8cf3141dd68afd9efafb86ccdbb18295fab59':
  Fixes to FlpHal JNI layer.
 2013-08-22 12:43:19 -07:00
destradaa
e0b8cf3141 am d5deafa4: Merge "Fixes to FlpHal JNI layer." into klp-dev 
* commit 'd5deafa45fcec7ac779d835132e90810225056cd':
  Fixes to FlpHal JNI layer.
 2013-08-22 12:39:57 -07:00
destradaa
d5deafa45f Merge "Fixes to FlpHal JNI layer." into klp-dev 2013-08-22 19:37:37 +00:00
Jean-Michel Trivi
e18a1de266 am dde59d6a: am 198bc229: Merge "Ratings for RemoteControl" into klp-dev 
* commit 'dde59d6ad1f697f86aba551604540c0f05d8c6b6':
  Ratings for RemoteControl
 2013-08-22 11:40:22 -07:00
Jean-Michel Trivi
dde59d6ad1 am 198bc229: Merge "Ratings for RemoteControl" into klp-dev 
* commit '198bc229c37fc65c7b61f1452345fb1da9c385b6':
  Ratings for RemoteControl
 2013-08-22 11:38:12 -07:00