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

117427 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
d1b0af8285 am 3f6d9630: am 34aab81a: Merge "add information about required meta-data for gcore bug: 11553131" into klp-docs 
* commit '3f6d9630e8a8d7b5b3040d510885e10fca6e4efc':
  add information about required meta-data for gcore bug: 11553131
 2013-11-13 23:38:02 -08:00
Scott Main
3f6d9630e8 am 34aab81a: Merge "add information about required meta-data for gcore bug: 11553131" into klp-docs 
* commit '34aab81a255545a029dc436bd63dd275a6ef3aa5':
  add information about required meta-data for gcore bug: 11553131
 2013-11-14 07:32:22 +00:00
Scott Main
34aab81a25 Merge "add information about required meta-data for gcore bug: 11553131" into klp-docs 2013-11-14 07:28:58 +00:00
Satoshi Kataoka
b97e102c4b am 1b570b57: am 5fd5aa3d: Fix compatibility issue on InputMethodSubtype 
* commit '1b570b571a63311f7f7d5b7cc5e17b3103fa8af9':
  Fix compatibility issue on InputMethodSubtype
 2013-11-13 22:28:47 -08:00
Satoshi Kataoka
1b570b571a am 5fd5aa3d: Fix compatibility issue on InputMethodSubtype 
* commit '5fd5aa3d066fc12c92b5b6541d85ac243556223f':
  Fix compatibility issue on InputMethodSubtype
 2013-11-13 22:25:01 -08:00
Jean Chalard
86a35ab4e7 am 94be0049: am 4863e686: Merge "[DO NOT MERGE] Improve documentation for InputType and EditorInfo." into klp-docs 
* commit '94be004960d5cabacb5da4a98e08b02d174b0ba7':
  [DO NOT MERGE] Improve documentation for InputType and EditorInfo.
 2013-11-13 22:11:48 -08:00
Satoshi Kataoka
5fd5aa3d06 Fix compatibility issue on InputMethodSubtype 
Bug: 11032428
Change-Id: If722bbbfb69d00e1830007582d46a33319203eea
 2013-11-14 15:08:39 +09:00
Jean Chalard
94be004960 am 4863e686: Merge "[DO NOT MERGE] Improve documentation for InputType and EditorInfo." into klp-docs 
* commit '4863e686d8db10537a1131732672da5203245788':
  [DO NOT MERGE] Improve documentation for InputType and EditorInfo.
 2013-11-14 06:08:28 +00:00
Jean Chalard
4863e686d8 Merge "[DO NOT MERGE] Improve documentation for InputType and EditorInfo." into klp-docs 2013-11-14 06:04:15 +00:00
Scott Main
f0373abef9 add information about required meta-data for gcore 
bug: 11553131

Change-Id: Ie3890c7894a017fc28e4a094a0e1ec3ac9f8c043
 2013-11-13 21:45:35 -08:00
Adam Powell
73a4aeb9ff am 75ae8983: am 48d2bcf2: Reset padding flags when set programmatically or implicitly from background 
* commit '75ae89837615fa9cebd6cbb051213c025c48bcf6':
  Reset padding flags when set programmatically or implicitly from background
 2013-11-13 19:45:21 -08:00
Adam Powell
75ae898376 am 48d2bcf2: Reset padding flags when set programmatically or implicitly from background 
* commit '48d2bcf2ce2305356c5a4f0dfbb928dc5a4c8331':
  Reset padding flags when set programmatically or implicitly from background
 2013-11-13 19:41:07 -08:00
Adam Powell
48d2bcf2ce Reset padding flags when set programmatically or implicitly from background 
Bug 11673480

Change-Id: I4f33c7ae46e937302e625bf1f3260adb25843645
 2013-11-13 19:21:50 -08:00
Jim Miller
71fb32e080 am 5305fe3f: am 39af5a78: Merge "Don\'t set up external displays from binder thread" into klp-dev 
* commit '5305fe3f0971274d90d875cfbeffdb18e3b03f09':
  Don't set up external displays from binder thread
 2013-11-13 17:54:11 -08:00
Svetoslav
5880b363a6 am fe666e84: am 4e041150: Merge "Avoid NPE and add a warning log if a printing app misbehaves." into klp-dev 
* commit 'fe666e848a1672a414bad93c105fa876f6c9f4de':
  Avoid NPE and add a warning log if a printing app misbehaves.
 2013-11-13 17:54:08 -08:00
Jim Miller
fdf7c36daa am 378c804d: am c8867b28: Merge "Report keyguard as initially showing and secure until we know" into klp-dev 
* commit '378c804d652f32547d3fe460842e5720b57bd9f1':
  Report keyguard as initially showing and secure until we know
 2013-11-13 17:54:04 -08:00
Robert Greenwalt
d4257e8f46 resolved conflicts for merge of ec9e8933 to klp-dev-plus-aosp 
Change-Id: I220a034cf3293a4a29d8683f20812adac112bddd
 2013-11-13 17:50:35 -08:00
Jim Miller
5305fe3f09 am 39af5a78: Merge "Don\'t set up external displays from binder thread" into klp-dev 
* commit '39af5a78c073d01539625a9fbbb8511747e2f048':
  Don't set up external displays from binder thread
 2013-11-13 17:50:26 -08:00
Svetoslav
fe666e848a am 4e041150: Merge "Avoid NPE and add a warning log if a printing app misbehaves." into klp-dev 
* commit '4e04115052a66d5a7836c5e7a9bfc1a5d6f3784b':
  Avoid NPE and add a warning log if a printing app misbehaves.
 2013-11-13 17:50:22 -08:00
Jim Miller
378c804d65 am c8867b28: Merge "Report keyguard as initially showing and secure until we know" into klp-dev 
* commit 'c8867b2807b6d7ffcd3c2f935d1fe8c857a9ef8d':
  Report keyguard as initially showing and secure until we know
 2013-11-13 17:50:18 -08:00
Jim Miller
39af5a78c0 Merge "Don't set up external displays from binder thread" into klp-dev 2013-11-14 01:47:32 +00:00
Svetoslav
4e04115052 Merge "Avoid NPE and add a warning log if a printing app misbehaves." into klp-dev 2013-11-14 01:46:47 +00:00
Jim Miller
c8867b2807 Merge "Report keyguard as initially showing and secure until we know" into klp-dev 2013-11-14 01:45:52 +00:00
Svetoslav
afd1967503 Avoid NPE and add a warning log if a printing app misbehaves. 
An app can print only from an activity. If the activity is finished
before printing completes we destroy the PrintDocumentAdapter. The
app may however invoke some of the print callbacks after destruction
resulting in a NPE. This change checks if the adapter is destroyed
and if so does not crash while printing a meaningful log error with
the mistake of the app developer.

bug:11675274

Change-Id: I66539cfbd7583f52cb863a84ef8e40856f92ceed
 2013-11-13 17:31:15 -08:00
Glenn Kasten
c5f317e48e am 1b21665b: am c32d89f6: Merge "Replace keyboard sounds with latest (softer) design" into klp-dev 
* commit '1b21665bf6a1049809185e878e0e29ed3f29d197':
  Replace keyboard sounds with latest (softer) design
 2013-11-13 17:16:09 -08:00
Glenn Kasten
1b21665bf6 am c32d89f6: Merge "Replace keyboard sounds with latest (softer) design" into klp-dev 
* commit 'c32d89f63f5eb8b764e88dbe4c0bcefab330cfb2':
  Replace keyboard sounds with latest (softer) design
 2013-11-13 17:12:13 -08:00
Glenn Kasten
c32d89f63f Merge "Replace keyboard sounds with latest (softer) design" into klp-dev 2013-11-14 01:09:52 +00:00
Jim Miller
80cb9bcfc0 Don't set up external displays from binder thread 
This fixes a bug where keyguard was attempting to set up
external presentation displays from the binder thread instead
of the UI thread.  Bad dog.

Fixes bug 11676486

Change-Id: Iadbe485691acc56a41b23219fe399f7eda40cb7c
 2013-11-13 16:47:20 -08:00
Vinit Deshapnde
9dbaaab85e am daf21d76: am 75c12de0: Merge "Increase Reject threshold for disabling networks" into klp-dev 
* commit 'daf21d76d2d4316a08531a0598d303ae427c7467':
  Increase Reject threshold for disabling networks
 2013-11-13 16:44:59 -08:00
Lajos Molnar
752926c752 am 1197bc37: am 7e11b16b: VideoView: expand documentation on state save/restore limitations 
* commit '1197bc37e58fe7cd5ab32278367e53f19f01f784':
  VideoView: expand documentation on state save/restore limitations
 2013-11-13 16:44:55 -08:00
Vinit Deshapnde
daf21d76d2 am 75c12de0: Merge "Increase Reject threshold for disabling networks" into klp-dev 
* commit '75c12de0cd35b8f969d64fc44eb172e283063538':
  Increase Reject threshold for disabling networks
 2013-11-13 16:40:29 -08:00
Lajos Molnar
1197bc37e5 am 7e11b16b: VideoView: expand documentation on state save/restore limitations 
* commit '7e11b16b9f8896170d492240a5fd50c8bd04105d':
  VideoView: expand documentation on state save/restore limitations
 2013-11-13 16:40:26 -08:00
Vinit Deshapnde
75c12de0cd Merge "Increase Reject threshold for disabling networks" into klp-dev 2013-11-14 00:36:54 +00:00
Robert Greenwalt
7fdfe28c75 am 4c514f2a: am 594eeb08: Merge "Fix for the invalid Global Proxy Setting" into klp-dev 
* commit '4c514f2a688bdae319c919987092ccfee690f390':
  Fix for the invalid Global Proxy Setting
 2013-11-13 16:29:12 -08:00
Robert Greenwalt
ec9e8933ef am 3b9244b4: Merge "Fix for the invalid Global Proxy Setting" 
* commit '3b9244b4b4d5008daa9763a169a751975c75cc54':
  Fix for the invalid Global Proxy Setting
 2013-11-13 16:27:56 -08:00
Lajos Molnar
7e11b16b9f VideoView: expand documentation on state save/restore limitations 
Change-Id: I46f231d314fc4ae8d9d11389aa62a3e2698122ed
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 11412889
 2013-11-13 16:27:30 -08:00
Robert Greenwalt
4c514f2a68 am 594eeb08: Merge "Fix for the invalid Global Proxy Setting" into klp-dev 
* commit '594eeb082e548617ff5092496888c43457593c2b':
  Fix for the invalid Global Proxy Setting
 2013-11-13 16:26:45 -08:00
Craig Mautner
1fbb5da29a am 29bbd570: am 1f0f9fa9: Merge "Add null pointer check." into klp-dev 
* commit '29bbd570fe36c55321a3cd9d84330dea9d2f1e10':
  Add null pointer check.
 2013-11-13 16:23:38 -08:00
Robert Greenwalt
3b9244b4b4 Merge "Fix for the invalid Global Proxy Setting" 2013-11-14 00:23:04 +00:00
Robert Greenwalt
594eeb082e Merge "Fix for the invalid Global Proxy Setting" into klp-dev 2013-11-14 00:22:46 +00:00
Craig Mautner
29bbd570fe am 1f0f9fa9: Merge "Add null pointer check." into klp-dev 
* commit '1f0f9fa94913198cd79b8d350cf9e8df8001daeb':
  Add null pointer check.
 2013-11-13 16:20:02 -08:00
Craig Mautner
1f0f9fa949 Merge "Add null pointer check." into klp-dev 2013-11-14 00:15:55 +00:00
Raj Mamadgi
92d02491ad Fix for the invalid Global Proxy Setting 
Adding validation for Global Proxy setting before it is
being set.

Proxy is validated at the boot time also to make sure
the value set is valid.

Signed-off-by: Raj Mamadgi <rmamadgi@sta.samsung.com>
bug:11598568

Change-Id: Idff5ae81119d8143da096b5291ecbfbc5875cbd4
 2013-11-14 00:08:21 +00:00
Vinit Deshapnde
8fa06ee413 Increase Reject threshold for disabling networks 
This change modifies a framework optimization. The framework optimization
disables a network when an access point repeatedly rejects requests
to associate with it. This change has some problems; one being that
it counts the rejects for all networks, and not for a specific network.
This incorrectly penalizes last networks at times; and since the current
threshold is 4 rejects, the probability of penalizing wrong networks
is high. This change ups that number to 16 to reduce that probability.

Bug: 11654725

Change-Id: I7150a9ccbb54bac44f2c2ba100fb6617ded33616
 2013-11-13 15:48:11 -08:00
Jim Miller
e5f17ab5a6 Report keyguard as initially showing and secure until we know 
This fixes a bug where an app calls KeyguardManager.isLocked()
before keyguard has had a chance to show.  The fix is to assume
keyguard is showing and secure until we know otherwise.

Fixes bug 11670159

Change-Id: Ifbe4cdf40e3b76d2069ecace940f85fa58f31187
 2013-11-13 15:40:48 -08:00
Elliott Hughes
3857dbe11c am 84f4ad80: am 87c5eeb4: Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." 
* commit '84f4ad807152b6266431144425f153c48db28696':
  Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
 2013-11-13 15:26:53 -08:00
Ed Heyl
117e4014c6 am af49ff8c: am a951fa56: merge in release branch changes (no-op). 
* commit 'af49ff8c395262a29cb670c86faa0d78cec46034':
  camera2: Remove prior repeating request when setting.
 2013-11-13 15:26:25 -08:00
Ed Heyl
af49ff8c39 am a951fa56: merge in release branch changes (no-op). 
* commit 'a951fa56f1855cd0337bddacc01e35868c6d66d6':
  camera2: Remove prior repeating request when setting.
 2013-11-13 15:23:23 -08:00
Elliott Hughes
84f4ad8071 am 87c5eeb4: Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." 
* commit '87c5eeb48b1a0c498eae9bd2877fb33678d90b8a':
  Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
 2013-11-13 15:21:51 -08:00
Ed Heyl
a951fa56f1 merge in release branch changes (no-op). 2013-11-13 15:19:22 -08:00