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

154472 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
497cb6c0a9 Merge "Avoid creating Caches instance with gfxinfo dump" into lmp-mr1-dev 2014-10-02 20:02:43 +00:00
Chris Craik
438fe5937f Merge "Clear preordered list in translateBoundsAndIntersectionsInWindowCoordinates" into lmp-mr1-dev 2014-10-02 20:02:31 +00:00
Dianne Hackborn
67a101aa30 SDK only: Update docs to reflect current implementation. 
Change-Id: I498425bb55b157c954af6a2441d8bd9be3871c55
 2014-10-02 12:44:01 -07:00
Jason Monk
cf0f97a3aa Synchronize on all sendProxyBroadcast calls 
To avoid race conditions.  Also make mDefaultProxy volatile for
safety.

Bug: 17697364
Change-Id: I8f0abb1a6e1c816f3addc11a69ff794ad767f2cf
 2014-10-02 15:39:38 -04:00
Chris Craik
59e129fbc8 Merge "Account for colorfilter transparency in determining paint opacity" into lmp-mr1-dev 2014-10-02 19:28:09 +00:00
Craig Mautner
333c2ec883 Remove misleading error log. 
It's perfectly ok for a secondary display to not have a home stack.
There is no reason to report it.

Related to b/17677973.

Change-Id: Ia9d52cabb601760d32d2b847dfa0ca4f304e4e2a
 2014-10-02 12:24:02 -07:00
Etan Cohen
6415fba31c Add TD_SCDMA RAT type (already exists in RIL) and classify as CDMA. 
Bug: 17784975
Change-Id: Ic887477fac1d45f547e30ed6e3c1158fb9a3b893
 2014-10-02 19:14:18 +00:00
Etan Cohen
6062a09dbc Enable VoLTE on VZW 311/480 
Change-Id: I81188c2a7dfe4657d35048f7b4e76fe01803f9a1
 2014-10-02 19:13:19 +00:00
Jeff Brown
9615697902 Fix race in RecognizerService teardown. 
Use a WeakReference to refer to the outer class to prevent leaks.
Ensure atomicity of access to the reference.

Bug: 17584947
Change-Id: I7ad7c7793b60fa125e04fc4d803ed905e8a00a95
 2014-10-02 12:10:08 -07:00
Deepanshu Gupta
3c8140ab4b Minor style changes. 
Addressing code review comments on previous change: 171804201dd

Change-Id: I2c9e0ce35e755c23d8292749828d15a87109d6dc
 2014-10-02 11:45:07 -07:00
Ricardo Cervera
0825c0a70a am 96762e59: am 134b62ed: am e1e0e05a: am 957f45c3: am 680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs 
* commit '96762e59b77d08b7165d39ec8d5db4a1240334b8':
  docs: Provide direct link to Ubuntu troubleshooting.
 2014-10-02 18:28:41 +00:00
Ricardo Cervera
96762e59b7 am 134b62ed: am e1e0e05a: am 957f45c3: am 680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs 
* commit '134b62ed14b830b467423082036b3222f84f291c':
  docs: Provide direct link to Ubuntu troubleshooting.
 2014-10-02 18:23:46 +00:00
Ricardo Cervera
134b62ed14 am e1e0e05a: am 957f45c3: am 680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs 
* commit 'e1e0e05a14ebb87ca1921cf21a98b9fa0067b14e':
  docs: Provide direct link to Ubuntu troubleshooting.
 2014-10-02 18:18:30 +00:00
Ricardo Cervera
e1e0e05a14 am 957f45c3: am 680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs 
* commit '957f45c328c9cbe9d1fb65dab6d342dc28a85954':
  docs: Provide direct link to Ubuntu troubleshooting.
 2014-10-02 18:13:55 +00:00
Rich Slogar
a3d739d874 am 6778b81f: am da5febdc: am 74ce7413: am b15cd529: am c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs 
* commit '6778b81fce54882635e8e6235a052bd3af569360':
  docs: Update for Android 23.0.4
 2014-10-02 18:07:53 +00:00
Ricardo Cervera
957f45c328 am 680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs 
* commit '680092c5987e701043ff0fa0d2c5390e829412c0':
  docs: Provide direct link to Ubuntu troubleshooting.
 2014-10-02 18:07:53 +00:00
Ricardo Cervera
680092c598 Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs 2014-10-02 18:04:42 +00:00
Rich Slogar
6778b81fce am da5febdc: am 74ce7413: am b15cd529: am c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs 
* commit 'da5febdcb24fd74feb1341a8b0deb92089388595':
  docs: Update for Android 23.0.4
 2014-10-02 18:03:19 +00:00
Ricardo Cervera
4ffffb8e8c docs: Provide direct link to Ubuntu troubleshooting. 
Change-Id: I6a9f8c3f3ef01abcfdaf95730139156ba443a4be
 2014-10-02 10:57:39 -07:00
Rich Slogar
da5febdcb2 am 74ce7413: am b15cd529: am c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs 
* commit '74ce7413158607af6be2889d7392c2e904c9c210':
  docs: Update for Android 23.0.4
 2014-10-02 17:53:38 +00:00
Rich Slogar
74ce741315 am b15cd529: am c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs 
* commit 'b15cd5296675fac00e5517b89fc1263d59fbad65':
  docs: Update for Android 23.0.4
 2014-10-02 17:44:43 +00:00
Michael Wright
4d1bb519db Merge "Add supported refresh rates for all DisplayDeviceInfos." into lmp-mr1-dev 2014-10-02 17:40:25 +00:00
Ihab Awad
4cb7274d16 Merge "Update api/current.txt" into lmp-mr1-dev 2014-10-02 17:39:08 +00:00
Rich Slogar
b15cd52966 am c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs 
* commit 'c074c3a4074791ae1270e3177e2299f31b9bb5a1':
  docs: Update for Android 23.0.4
 2014-10-02 17:38:35 +00:00
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
Ihab Awad
463dcae219 Update api/current.txt 
Changes made in branch lmp-dev are @hide-den there but not here. When
they propagate downstream, we need to update api/current.txt.

Change-Id: Ic267f62391503d9acfb8451b16d5bb18035c948c
 2014-10-02 10:13:30 -07:00
Kenny Guy
27cee10057 am bdcfc01b: am 3de09018: Merge "SettingsProvider should use correct cache when redirecting to user 0." into lmp-dev 
* commit 'bdcfc01b3bff1ff1c4237dccfb90704326890bee':
  SettingsProvider should use correct cache when redirecting to user 0.
 2014-10-02 17:00:42 +00:00
Kenny Guy
bdcfc01b3b 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:55:35 +00:00
Newton Allen
94f5155d6c am c68aad9f: am d84ce32b: Merge "Fix some documentation typos." into lmp-dev 
* commit 'c68aad9fd0f7937176ac6a8238e6236dd7ea3427':
  Fix some documentation typos.
 2014-10-02 16:52:50 +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
c68aad9fd0 am d84ce32b: Merge "Fix some documentation typos." into lmp-dev 
* commit 'd84ce32bd2d7c3cebac15545504f4fec464a6956':
  Fix some documentation typos.
 2014-10-02 16:47:19 +00:00
Newton Allen
d84ce32bd2 Merge "Fix some documentation typos." into lmp-dev 2014-10-02 16:39:12 +00:00
Paul West
c55a2547a1 am bebcde44: Merge "[DS] DSDS support for widget view" into lmp-sprout-dev 
* commit 'bebcde4453af3f0711c60d09f5b0f82076daff3d':
  [DS] DSDS support for widget view
 2014-10-02 15:28:41 +00:00
Paul West
bebcde4453 Merge "[DS] DSDS support for widget view" into lmp-sprout-dev 2014-10-02 15:24:14 +00:00
smain@google.com
629e2f5483 am 94f04cbe: am 74c2ec36: Merge "fix confusing sentence https://memegen.googleplex.com/5524829602054144" into lmp-dev 
* commit '94f04cbe4bf5e531a74cc1cdc5b080110f47f5a5':
  fix confusing sentence https://memegen.googleplex.com/5524829602054144
 2014-10-02 15:10:29 +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
94f04cbe4b 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:06 +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
b29b651dd5 am a590a95c: am d982b582: Merge "Fix ChangeTransform works only once on a View." into lmp-dev 
* commit 'a590a95c4d3b68f9df40b76eef1462d159ff568f':
  Fix ChangeTransform works only once on a View.
 2014-10-02 14:39:41 +00:00
George Mount
a590a95c4d 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:33: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
eef8d3eb40 am df959707: am 7fe95529: Merge "Revert the configKey generation algorithm to what it was in K." into lmp-dev 
* commit 'df959707ff086ae1ffe516b516bfd99ac463b803':
  Revert the configKey generation algorithm to what it was in K.
 2014-10-02 11:18:50 +00:00
Lorenzo Colitti
df959707ff 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:12:26 +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
Deepanshu Gupta
70d72265b2 am 9d474197: am 107e1fb4: am ae74287e: (-s ours) am fca5e557: Merge "Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]" into klp-modular-dev 
* commit '9d474197856fcfc3e6f0aee7c1139d3cf493d067':
  Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]
 2014-10-02 09:38:27 +00:00
Deepanshu Gupta
4ae7dbbaa0 am 2fca3e94: am d3adf40e: am ae4cb17a: (-s ours) am 76aff1f6: Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev 
* commit '2fca3e944f263bd50e4f61049399bddf957c936c':
  Resource resolution bug fix. [DO NOT MERGE]
 2014-10-02 09:38:24 +00:00
Deepanshu Gupta
3a86340106 am 81f03898: am ba526a28: am d00d2ff2: (-s ours) am 57933834: Merge "Fix Tests after cherry picks. [DO NOT MERGE]" into klp-modular-dev 
* commit '81f03898e59400bb77eb6525956b06e6762b550e':
  Fix Tests after cherry picks. [DO NOT MERGE]
 2014-10-02 09:38:21 +00:00
Deepanshu Gupta
16df192a2b am 4d19dc0e: am a9787de3: am 735229c5: (-s ours) am 52af468b: Merge "Update intelliJ copyright profile [DO NOT MERGE]" into klp-modular-dev 
* commit '4d19dc0ec185c5e3c79d49e45e2df15c803e3f05':
  Update intelliJ copyright profile [DO NOT MERGE]
 2014-10-02 09:38:18 +00:00