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

158146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rich Slogar
c074c3a407 Merge "docs: Update for Android 23.0.4" into klp-modular-docs 2014-10-02 17:31:05 +00:00
Rich Slogar
f34d0e6903 docs: Update for Android 23.0.4 
Change-Id: I7025dcf9bbfd03b555f7f5059d0e35f67f836dcf
 2014-10-02 10:19:17 -07:00
Glenn Kasten
e27002d77f resolved conflicts for merge of 1c92912b to lmp-dev-plus-aosp 
Change-Id: I5a57218e81dff86f46af7067d47f7af816e2d12c
 2014-10-02 10:19:12 -07:00
Kenny Guy
e4a091bb82 am 3de09018: Merge "SettingsProvider should use correct cache when redirecting to user 0." into lmp-dev 
* commit '3de09018a9611b1791cc29ed5200b7d9694189a9':
  SettingsProvider should use correct cache when redirecting to user 0.
 2014-10-02 16:54:18 +00:00
Kenny Guy
3de09018a9 Merge "SettingsProvider should use correct cache when redirecting to user 0." into lmp-dev 2014-10-02 16:48:57 +00:00
Newton Allen
408f7534ef am d84ce32b: Merge "Fix some documentation typos." into lmp-dev 
* commit 'd84ce32bd2d7c3cebac15545504f4fec464a6956':
  Fix some documentation typos.
 2014-10-02 16:46:03 +00:00
Newton Allen
d84ce32bd2 Merge "Fix some documentation typos." into lmp-dev 2014-10-02 16:39:12 +00:00
Glenn Kasten
1c92912bcb am 6ba13ac5: Merge "AudioService: Fix monitorRotation for landscape applications" 
* commit '6ba13ac56663a45a7f16feb465d451f0180fae26':
  AudioService: Fix monitorRotation for landscape applications
 2014-10-02 16:23:36 +00:00
Glenn Kasten
6ba13ac566 Merge "AudioService: Fix monitorRotation for landscape applications" 2014-10-02 16:19:12 +00:00
Paul Jensen
c8b9a7428d Send updated NetworkAgent score to NetworkFactories when validated. 
Previously the score was not sent out causing other NetworkFactories
to have the lower unvalidated score and to repeatedly try to bring
up a new Network only to have it torn down.
Also, avoid logging an error when tearing down a network with only
listening requests.

bug:17726566
Change-Id: I82ff7c9bd5ec962f62a50ad0042c278622953969
 2014-10-02 11:06:43 -04:00
smain@google.com
2b7d4b24a3 am 74c2ec36: Merge "fix confusing sentence https://memegen.googleplex.com/5524829602054144" into lmp-dev 
* commit '74c2ec3644101ce4cc96e11a851daf21bf35e174':
  fix confusing sentence https://memegen.googleplex.com/5524829602054144
 2014-10-02 15:06:18 +00:00
smain@google.com
74c2ec3644 Merge "fix confusing sentence https://memegen.googleplex.com/5524829602054144" into lmp-dev 2014-10-02 15:02:17 +00:00
Paul Jensen
4b9b2be894 Allow any unvalidated Network to satisfy NetworkRequests. 
Explicitly selected Networks may never be validated (e.g. Chromecast)
but are still given a high score so they can explicitly become the
default Network.  Without this fix they do not become the default
Network if another Network is present.  This was an artifact of how
unvalidated Networks were handled, but now that unvalidated Networks
are properly handled, ala 50807d, we can freely rematch even
unvalidated Networks and NetworkRequests.
Also, never linger and teardown unvalidated Networks as the user
might be in the process of signing in.  This better matches prior
behavior when unvalidated networks didn't match NetworkRequests,
and thus were never lingered.
Also, don't disconnect networks that may be lingering.  The
disconnect logic in rematchNetworkAndReqeuests() is adjusted to only
fire when a network is newly validated.
It is incorrect to consider rematching uncreated Networks and
explicitly selecting created Networks, so this change logs error
messages in those cases.

bug:17647968
bug:17396616
Change-Id: Id6b8a350b8200f484d5bfd14ca0a8f64f08846a0
 2014-10-02 10:56:51 -04:00
George Mount
60a27c87ef am d982b582: Merge "Fix ChangeTransform works only once on a View." into lmp-dev 
* commit 'd982b582d1993288347f771177f6889fe14fb387':
  Fix ChangeTransform works only once on a View.
 2014-10-02 14:34:15 +00:00
George Mount
d982b582d1 Merge "Fix ChangeTransform works only once on a View." into lmp-dev 2014-10-02 14:27:21 +00:00
Lorenzo Colitti
58b8873278 am 7fe95529: Merge "Revert the configKey generation algorithm to what it was in K." into lmp-dev 
* commit '7fe95529e638467b77372dcac0efe51529e3bde1':
  Revert the configKey generation algorithm to what it was in K.
 2014-10-02 11:11:58 +00:00
Lorenzo Colitti
7fe95529e6 Merge "Revert the configKey generation algorithm to what it was in K." into lmp-dev 2014-10-02 11:05:21 +00:00
Neil Fuller
f7cf5d43aa resolved conflicts for merge of ee665151 to lmp-dev-plus-aosp 
Change-Id: I97671e62de26919e391dbb2686511584c59ab990
 2014-10-02 11:48:08 +01:00
Neil Fuller
ee665151a4 am 0c1faf43: Merge "Switch from FloatMath -> Math and Math.hypot where possible" 
* commit '0c1faf43aecadc37b78c4ad6cb669eb351d21385':
  Switch from FloatMath -> Math and Math.hypot where possible
 2014-10-02 10:18:29 +00:00
Neil Fuller
0c1faf43ae Merge "Switch from FloatMath -> Math and Math.hypot where possible" 2014-10-02 10:14:19 +00:00
Deepanshu Gupta
92c414724f am 107e1fb4: am ae74287e: (-s ours) am fca5e557: Merge "Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]" into klp-modular-dev 
* commit '107e1fb4b8ec4c16c5a6ed4635cb0acaea8e2b39':
  Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]
 2014-10-02 09:43:01 +00:00
Deepanshu Gupta
268f95502e am d3adf40e: am ae4cb17a: (-s ours) am 76aff1f6: Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev 
* commit 'd3adf40ee0845844ed132dd0b25ec0102b9bf919':
  Resource resolution bug fix. [DO NOT MERGE]
 2014-10-02 09:42:57 +00:00
Deepanshu Gupta
e58940bf94 am ba526a28: am d00d2ff2: (-s ours) am 57933834: Merge "Fix Tests after cherry picks. [DO NOT MERGE]" into klp-modular-dev 
* commit 'ba526a288811bc6520ad9a70d57e7ef774bbb802':
  Fix Tests after cherry picks. [DO NOT MERGE]
 2014-10-02 09:42:53 +00:00
Deepanshu Gupta
86af4579c1 am a9787de3: am 735229c5: (-s ours) am 52af468b: Merge "Update intelliJ copyright profile [DO NOT MERGE]" into klp-modular-dev 
* commit 'a9787de33c703fbfbb89b02d9d3d5642305084f8':
  Update intelliJ copyright profile [DO NOT MERGE]
 2014-10-02 09:42:49 +00:00
Deepanshu Gupta
2ffcf6ea7a am 75f2f993: am 925abb6d: (-s ours) am 891f38d1: Merge "Build layoutlib create tests as part of sdk build. [DO NOT MERGE]" into klp-modular-dev 
* commit '75f2f993392a3903d160e7fed81c0b7ff5cf76f1':
  Build layoutlib create tests as part of sdk build. [DO NOT MERGE]
 2014-10-02 09:42:45 +00:00
Deepanshu Gupta
c3ad47d885 am 473a2708: am a21ca344: (-s ours) am a2f088b6: Merge "Add layoutlib tests to DIST_DIR [DO NOT MERGE]" into klp-modular-dev 
* commit '473a270852c4316f9840f5190b1cdde8db9e1fef':
  Add layoutlib tests to DIST_DIR [DO NOT MERGE]
 2014-10-02 09:42:41 +00:00
Deepanshu Gupta
62813fb447 am d24b45c8: am 93bf0696: (-s ours) am 541e6e5d: Merge "Build layoutlib_create tests. [DO NOT MERGE]" into klp-modular-dev 
* commit 'd24b45c807aa788bbb25647166d155d0ed385ddf':
  Build layoutlib_create tests. [DO NOT MERGE]
 2014-10-02 09:42:37 +00:00
Deepanshu Gupta
bebf17cd11 am 42099d45: am ddbd9bec: (-s ours) am 2d77fad2: Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]" into klp-modular-dev 
* commit '42099d45c3f39989c9c4ec1a5f67206f9c23342b':
  Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]
 2014-10-02 09:42:33 +00:00
Deepanshu Gupta
ebe7858157 am b183c181: am 1cbf17f7: (-s ours) am ffa4115a: Merge "Get filename from File faster [DO NOT MERGE]" into klp-modular-dev 
* commit 'b183c1812b76411161e9f71a313d2f6384ab9162':
  Get filename from File faster [DO NOT MERGE]
 2014-10-02 09:42:29 +00:00
Deepanshu Gupta
e17a59ba99 am 9eb0cd12: am d332ff3e: (-s ours) am bae64421: Merge "Add testing framework to LayoutLib. [DO NOT MERGE]" into klp-modular-dev 
* commit '9eb0cd12742bdd6098932eedfd33a0b14f2196c9':
  Add testing framework to LayoutLib. [DO NOT MERGE]
 2014-10-02 09:42:26 +00:00
Deepanshu Gupta
432b0cbc82 am 82eecaf8: am c2ffb54f: (-s ours) am 60f3676e: Merge "Add tests to the layoutlib eclipse project. [DO NOT MERGE]" into klp-modular-dev 
* commit '82eecaf826ab06c4f3cb0716a009ff0c8ae00711':
  Add tests to the layoutlib eclipse project. [DO NOT MERGE]
 2014-10-02 09:42:22 +00:00
Justin Koh
7eff2b547a am f7aac12e: am bf6f081c: (-s ours) am 37185d90: Merge "DO NOT MERGE Hide the volume panel for watches for now" into klp-modular-dev 
* commit 'f7aac12e1bc766a4357ca29d2f248eef265097f8':
  DO NOT MERGE Hide the volume panel for watches for now
 2014-10-02 09:42:18 +00:00
Andreas Gampe
3a0fc17102 am c152c7aa: Merge "Revert "Frameworks/base: Update to preloaded-classes"" into lmp-dev 
* commit 'c152c7aad6ece42d101aede8efe9cdb5ea3f5a3c':
  Revert "Frameworks/base: Update to preloaded-classes"
 2014-10-02 09:42:14 +00:00
Deepanshu Gupta
107e1fb4b8 am ae74287e: (-s ours) am fca5e557: Merge "Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]" into klp-modular-dev 
* commit 'ae74287e036b432ca394cbc497386547b16c17ff':
  Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]
 2014-10-02 08:51:09 +00:00
Deepanshu Gupta
d3adf40ee0 am ae4cb17a: (-s ours) am 76aff1f6: Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev 
* commit 'ae4cb17a14d2a66961728d3cbd907cdba3f2f6d6':
  Resource resolution bug fix. [DO NOT MERGE]
 2014-10-02 08:51:06 +00:00
Deepanshu Gupta
ba526a2888 am d00d2ff2: (-s ours) am 57933834: Merge "Fix Tests after cherry picks. [DO NOT MERGE]" into klp-modular-dev 
* commit 'd00d2ff2079ca4e77173e3389834416494c7900f':
  Fix Tests after cherry picks. [DO NOT MERGE]
 2014-10-02 08:51:02 +00:00
Deepanshu Gupta
a9787de33c am 735229c5: (-s ours) am 52af468b: Merge "Update intelliJ copyright profile [DO NOT MERGE]" into klp-modular-dev 
* commit '735229c5a8286f1ecff5cf54d9ce2c06d7f97d51':
  Update intelliJ copyright profile [DO NOT MERGE]
 2014-10-02 08:50:58 +00:00
Deepanshu Gupta
75f2f99339 am 925abb6d: (-s ours) am 891f38d1: Merge "Build layoutlib create tests as part of sdk build. [DO NOT MERGE]" into klp-modular-dev 
* commit '925abb6d983aef0016b5828349d53cc5a11ebad8':
  Build layoutlib create tests as part of sdk build. [DO NOT MERGE]
 2014-10-02 08:50:54 +00:00
Deepanshu Gupta
473a270852 am a21ca344: (-s ours) am a2f088b6: Merge "Add layoutlib tests to DIST_DIR [DO NOT MERGE]" into klp-modular-dev 
* commit 'a21ca3449457c5a80b5f06ca9a1fe7b17eb33bff':
  Add layoutlib tests to DIST_DIR [DO NOT MERGE]
 2014-10-02 08:50:51 +00:00
Deepanshu Gupta
d24b45c807 am 93bf0696: (-s ours) am 541e6e5d: Merge "Build layoutlib_create tests. [DO NOT MERGE]" into klp-modular-dev 
* commit '93bf0696e74282fea614120f7e26951111150e48':
  Build layoutlib_create tests. [DO NOT MERGE]
 2014-10-02 08:50:47 +00:00
Deepanshu Gupta
42099d45c3 am ddbd9bec: (-s ours) am 2d77fad2: Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]" into klp-modular-dev 
* commit 'ddbd9bec76036fb2ce9f1cd1b7ccb70bd859a1a5':
  Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]
 2014-10-02 08:50:43 +00:00
Deepanshu Gupta
b183c1812b am 1cbf17f7: (-s ours) am ffa4115a: Merge "Get filename from File faster [DO NOT MERGE]" into klp-modular-dev 
* commit '1cbf17f7654d5ddb66ce76e0f50fe7f170726e20':
  Get filename from File faster [DO NOT MERGE]
 2014-10-02 08:50:38 +00:00
Deepanshu Gupta
9eb0cd1274 am d332ff3e: (-s ours) am bae64421: Merge "Add testing framework to LayoutLib. [DO NOT MERGE]" into klp-modular-dev 
* commit 'd332ff3e3f647b9514ecff1f146464fbc1a93372':
  Add testing framework to LayoutLib. [DO NOT MERGE]
 2014-10-02 08:50:34 +00:00
Deepanshu Gupta
82eecaf826 am c2ffb54f: (-s ours) am 60f3676e: Merge "Add tests to the layoutlib eclipse project. [DO NOT MERGE]" into klp-modular-dev 
* commit 'c2ffb54fe29d5fcbdd866fd304a9e97af825221a':
  Add tests to the layoutlib eclipse project. [DO NOT MERGE]
 2014-10-02 08:50:31 +00:00
Justin Koh
f7aac12e1b am bf6f081c: (-s ours) am 37185d90: Merge "DO NOT MERGE Hide the volume panel for watches for now" into klp-modular-dev 
* commit 'bf6f081cda7360810645cf6bf932687df1cfae00':
  DO NOT MERGE Hide the volume panel for watches for now
 2014-10-02 08:50:27 +00:00
Andreas Gampe
c152c7aad6 Merge "Revert "Frameworks/base: Update to preloaded-classes"" into lmp-dev 2014-10-02 08:45:47 +00:00
Andreas Gampe
16626a7ee9 Revert "Frameworks/base: Update to preloaded-classes" 
Breaks shamu for unknown reason.

This reverts commit da3050614fc9dc31d39ff87ae5df0261fb76f93c.

Bug: 17480683
Change-Id: Id10ff18ef6e3acb5eb84196f7e5608add7edeb66
 2014-10-02 08:45:09 +00:00
Andreas Gampe
e1b180e21e am 152d9aae: am 31629651: Merge "Frameworks/base: Fix more aapt issues" 
* commit '152d9aae631381ea28f5701168d372a1486a7502':
  Frameworks/base: Fix more aapt issues
 2014-10-02 07:07:13 +00:00
Andreas Gampe
152d9aae63 am 31629651: Merge "Frameworks/base: Fix more aapt issues" 
* commit '316296511bf12c4e14dfb6f54731d1a515114abf':
  Frameworks/base: Fix more aapt issues
 2014-10-02 07:01:55 +00:00
Andreas Gampe
316296511b Merge "Frameworks/base: Fix more aapt issues" 2014-10-02 06:58:39 +00:00