Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
120,039 Commits 3 Branches 0 Tags
a022c1933144e2406976cf23542606de8ba283ef
Commit Graph

120039 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
a022c19331 am d4257e8f: resolved conflicts for merge of ec9e8933 to klp-dev-plus-aosp 
* commit 'd4257e8f469eacc1ba8142b0b1bc4ca0327a7a0e':
  Fix for the invalid Global Proxy Setting
 2013-11-13 18:48:31 -08:00
Glenn Kasten
62ca3a891d am c5f317e4: am 1b21665b: am c32d89f6: Merge "Replace keyboard sounds with latest (softer) design" into klp-dev 
* commit 'c5f317e48e0406a0303eb1303cee4c5da2c6272d':
  Replace keyboard sounds with latest (softer) design
 2013-11-13 18:48:20 -08:00
Vinit Deshapnde
5d5f5a3791 am 9dbaaab8: am daf21d76: am 75c12de0: Merge "Increase Reject threshold for disabling networks" into klp-dev 
* commit '9dbaaab85eb4557b40086e6b37882af7b03725ba':
  Increase Reject threshold for disabling networks
 2013-11-13 18:48:13 -08:00
Lajos Molnar
bd686a1e1d am 752926c7: am 1197bc37: am 7e11b16b: VideoView: expand documentation on state save/restore limitations 
* commit '752926c752b9516c05a36f3eed6ab6b77d32b2c6':
  VideoView: expand documentation on state save/restore limitations
 2013-11-13 18:48:09 -08:00
Robert Greenwalt
8bf47a36b6 am 7fdfe28c: am 4c514f2a: am 594eeb08: Merge "Fix for the invalid Global Proxy Setting" into klp-dev 
* commit '7fdfe28c75e103b8a66b559dcb813576fbbf2eb5':
  Fix for the invalid Global Proxy Setting
 2013-11-13 18:47:57 -08:00
Craig Mautner
a3da4623b1 am 1fbb5da2: am 29bbd570: am 1f0f9fa9: Merge "Add null pointer check." into klp-dev 
* commit '1fbb5da29a4ebef1d758dffad9c2704a5932d223':
  Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
  Add null pointer check.
  Import translations. DO NOT MERGE
  Small DocumentsProvider doc improvements.
  Keyguard isn't visible if it hasn't been drawn.
  Enable fast camera transition when launched from navbar
  Reduce camera launch time by about 250ms.
  camera2: Remove prior repeating request when setting.
 2013-11-13 18:47:54 -08:00
Svetoslav
1b967a1b23 resolved conflicts for merge of 9358d98d to master 
Change-Id: I1facdcec6eeaa10805300c9d634957fbb86815d3
 2013-11-13 18:43:32 -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
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
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
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
Craig Mautner
f4703da89b am ef1dd26e: am 0e823a45: Merge "Keyguard isn\'t visible if it hasn\'t been drawn." into klp-dev 
* commit 'ef1dd26ee7b4d8a6ec854bd0b5b9557d67b554f5':
  Keyguard isn't visible if it hasn't been drawn.
 2013-11-13 15:18:47 -08:00
Elliott Hughes
87c5eeb48b Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." 2013-11-13 23:18:00 +00:00
Craig Mautner
ef1dd26ee7 am 0e823a45: Merge "Keyguard isn\'t visible if it hasn\'t been drawn." into klp-dev 
* commit '0e823a450a729a753fb8e0618474b6ae3cf3b810':
  Keyguard isn't visible if it hasn't been drawn.
 2013-11-13 15:14:45 -08:00
Craig Mautner
0e823a450a Merge "Keyguard isn't visible if it hasn't been drawn." into klp-dev 2013-11-13 23:11:12 +00:00
Elliott Hughes
99f752149b Fix a JNI local reference leak in JNIMediaPlayerListener::notify. 
Bug: https://code.google.com/p/android/issues/detail?id=62137
Change-Id: I776cd83a66de37fdbbe8af367bf1b26e5e0c7247
 2013-11-13 15:10:40 -08:00
Craig Mautner
ada62fca51 Add null pointer check. 
Fixes bug 11673948.

Change-Id: I60b590b9793ae1b8d5c3d343f4bb6cb40ba4a092
 2013-11-13 15:09:55 -08:00
Baligh Uddin
d5cb5d0fea am 22bc9f43: (-s ours) am dc0acc6f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '22bc9f4381e4b058124095abf50209c475c02908':
  Import translations. DO NOT MERGE
 2013-11-13 14:46:17 -08:00
Baligh Uddin
22bc9f4381 am dc0acc6f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'dc0acc6f5d4cc8e4ed6d2a13793030350cd6262d':
  Import translations. DO NOT MERGE
 2013-11-13 14:42:44 -08:00
Baligh Uddin
ef6a8aeb43 Merge "Import translations. DO NOT MERGE" 2013-11-13 22:39:57 +00:00
Baligh Uddin
dc0acc6f5d Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-13 22:39:40 +00:00
Jeff Sharkey
d596104a32 am 529ba106: am 711d390b: Merge "Small DocumentsProvider doc improvements." into klp-dev 
* commit '529ba10693bbb2d756b2ba6af706accdba64692a':
  Small DocumentsProvider doc improvements.
 2013-11-13 14:39:25 -08:00
Jeff Sharkey
529ba10693 am 711d390b: Merge "Small DocumentsProvider doc improvements." into klp-dev 
* commit '711d390be96531c5dfadb9a17e373f1e92ef16a1':
  Small DocumentsProvider doc improvements.
 2013-11-13 14:34:49 -08:00
Jim Miller
3b44dd88a5 am 291b7f56: am 3714473f: Merge "Enable fast camera transition when launched from navbar" into klp-dev 
* commit '291b7f56159a942911c5e83c42b89ecd2440708c':
  Enable fast camera transition when launched from navbar
 2013-11-13 14:32:35 -08:00
Jeff Sharkey
711d390be9 Merge "Small DocumentsProvider doc improvements." into klp-dev 2013-11-13 22:31:01 +00:00
Jim Miller
291b7f5615 am 3714473f: Merge "Enable fast camera transition when launched from navbar" into klp-dev 
* commit '3714473f1a077cae6eca3079da67a7dd09dcff65':
  Enable fast camera transition when launched from navbar
 2013-11-13 14:28:06 -08:00
Jim Miller
13c7984d2d am cefe47c0: am 9c8d56a6: Merge "Reduce camera launch time by about 250ms." into klp-dev 
* commit 'cefe47c0d3471aedd4f7d4d3b5137a2a95161ad4':
  Reduce camera launch time by about 250ms.
 2013-11-13 14:27:58 -08:00
Svetoslav Ganov
9358d98d83 am 852a8895: am d697ba73: Merge "Fix NPE at PrintSpooler in Japanese environment." into klp-dev 
* commit '852a8895e18ad578a4c299d13615a4cbb3ee1211':
  Fix NPE at PrintSpooler in Japanese environment.
 2013-11-13 14:27:54 -08:00
Jim Miller
cefe47c0d3 am 9c8d56a6: Merge "Reduce camera launch time by about 250ms." into klp-dev 
* commit '9c8d56a692198a3fc1629a0407ea6027f04e9a91':
  Reduce camera launch time by about 250ms.
 2013-11-13 14:24:26 -08:00