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

131677 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jerome Poichet
9e4f4040f3 Merge "Adding device name" 2014-05-14 18:57:14 +00:00
Adrian Roos
36f92166fc Merge "Follow up for "A better auto brightness"" 2014-05-14 18:30:01 +00:00
Adrian Roos
6e2d465b9c Follow up for "A better auto brightness" 
Original CL: I62d0695b7da16ffa7a27c465c3b6bc4b1515f9c0

Change-Id: I79c307586c0ba9be275d3920a3805f45b6006ce8
 2014-05-14 18:05:54 +00:00
John Spurlock
a7e089f28c Merge "Add QS rotation tile toggle animation." 2014-05-14 17:34:03 +00:00
John Spurlock
444eb2e130 Add QS rotation tile toggle animation. 
Change-Id: Ic7e6e36759ef17ab35d639d22bbd2f6bf2470272
 2014-05-14 13:32:14 -04:00
Craig Stout
162043076b Merge "AlertDialog and AppError themes for TV." 2014-05-14 16:19:51 +00:00
Robert Greenwalt
16fa43a28d Merge "Undeprecate funcs until we're ready for api-review" 2014-05-14 15:56:32 +00:00
Robert Greenwalt
7a91a7434a Undeprecate funcs until we're ready for api-review 
Fixing javadoc deprecated tags to fix a checkbuild error breaks the current/api.txt.
We're not ready for the api change yet, so back out the comments.

Change-Id: Ia95e394da7329c1b9e3876e589c3c2137ba18048
 2014-05-14 08:55:13 -07:00
Torne (Richard Coles)
93ffc21fc6 am 41ecc8b1: am dcc9cf03: am 41ec8c96: Merge "Avoid supported ABI list containing "unknown"." 
* commit '41ecc8b1e04794f3d6db01b594cb6daaafd8ae1d':
  Avoid supported ABI list containing "unknown".
 2014-05-14 15:40:39 +00:00
Torne (Richard Coles)
41ecc8b1e0 am dcc9cf03: am 41ec8c96: Merge "Avoid supported ABI list containing "unknown"." 
* commit 'dcc9cf03a846cb01d91de70d7a115d95c0c4db19':
  Avoid supported ABI list containing "unknown".
 2014-05-14 15:35:19 +00:00
Torne (Richard Coles)
dcc9cf03a8 am 41ec8c96: Merge "Avoid supported ABI list containing "unknown"." 
* commit '41ec8c9672fccce90a7156bcd856f59a36e93ad3':
  Avoid supported ABI list containing "unknown".
 2014-05-14 15:31:28 +00:00
Adrian Roos
23ccd2162e Merge "Fix visibility and add bouncer event in KeyguardUpdateMonitor" 2014-05-14 15:28:09 +00:00
Torne (Richard Coles)
41ec8c9672 Merge "Avoid supported ABI list containing "unknown"." 2014-05-14 15:26:05 +00:00
John Spurlock
f28d1ac6e0 Merge "Update QS bugreport icon." 2014-05-14 15:20:17 +00:00
John Spurlock
363814c984 Update QS bugreport icon. 
Change-Id: I24b2f7b88650e272bf1ab6409656164094382621
 2014-05-14 11:18:39 -04:00
Torne (Richard Coles)
da8c037c8b Avoid supported ABI list containing "unknown". 
If one of the ABI list system properties is undefined/empty (as
ro.product.cpu.abilist64 is on a 32-bit only device), getString returns
"unknown", which ends up creating a 1-element array with "unknown" as a
member. Fix this to instead just get the empty string and split that
into a 0-element array.

Change-Id: I0d0a54eb06bb04427bcf0487e2a16d4180b81116
 2014-05-14 16:17:26 +01:00
Adrian Roos
b601162a60 Fix visibility and add bouncer event in KeyguardUpdateMonitor 
Bug: 14087751
Change-Id: I45bc2213dfcce751180762d18ead0382f68cac74
 2014-05-14 16:51:18 +02:00
Robert Greenwalt
8ac546eaa3 Fix Javadoc 
It's Deprecated for an annotation, but deprecated for
a javadoc and case is important.

Fix build

Change-Id: I355dc1660196c09530b58386f401a85a74d16476
 2014-05-14 07:50:11 -07:00
Robert Greenwalt
54b6fd0cbe Merge "Add networks and requests to CS.dump" 2014-05-14 13:44:26 +00:00
Robert Greenwalt
c9c90c771c Add networks and requests to CS.dump 
Adds debugging.

Change-Id: I352dfe970c990fd210f3d1598519e321bbdd6ed5
(cherry picked from commit 9bdf6bd99db56c652ba9a62d91f258d11d19ca9f)
 2014-05-14 13:12:23 +00:00
Robert Greenwalt
9258c64bef Add Multinetwork API 
Change-Id: I3a9cef0d416db96d05098dd989ee3fef3b1e9274
(cherry picked from commit cc5e6afa1ba0bef099bcb21a64a36bc2bf7951db)
 2014-05-14 13:06:56 +00:00
Lorenzo Colitti
98e8c26b90 Merge "Handle legacy synchronous inspectors" 2014-05-14 12:48:46 +00:00
Lorenzo Colitti
612bf2f8d6 Merge "Get clatd/Nat464Xlat working with new NetworkAgents." 2014-05-14 12:48:28 +00:00
Lorenzo Colitti
111ac91393 Merge "Fix compile errors after merge." 2014-05-14 12:48:08 +00:00
Lorenzo Colitti
1163c5363c Merge "Disable calls to MobileDataStateTracker.isProvisioning() as there is no more MobileDataStateTracker so these just crash." 2014-05-14 12:47:46 +00:00
Lorenzo Colitti
6fd7b55122 Merge "Add NetworkMonitor. At present the network evaluation / captive portal detection is disabled pending addition of API to bind socket to network." 2014-05-14 12:47:24 +00:00
Lorenzo Colitti
131dcda9a2 Merge "Separate network and interface addition/removal netd APIs. This should facilitate stacked interfaces (i.e. clatd)." 2014-05-14 12:47:02 +00:00
Lorenzo Colitti
df3ef993cb Merge "Enabling internal msg apis" 2014-05-14 12:46:28 +00:00
Lorenzo Colitti
07133093f0 Merge "Fix build." 2014-05-14 12:46:07 +00:00
Lorenzo Colitti
4a0e0173f4 Merge "Specify netId when adding/removing routes." 2014-05-14 12:45:39 +00:00
Lorenzo Colitti
af46637e40 Merge "Set and clear the default network." 2014-05-14 12:45:18 +00:00
Lorenzo Colitti
9bc300e98f Merge "Update netd API." 2014-05-14 12:44:56 +00:00
Lorenzo Colitti
8f677677ec Merge "Get ConnectivityServiceTest building again after 8f80cc8." 2014-05-14 12:44:41 +00:00
Lorenzo Colitti
dffe0236c6 Merge "Use NetId instead of interface name when communicating DNS changes to netd." 2014-05-14 12:44:21 +00:00
Lorenzo Colitti
e8dbda2f76 Merge "Update the API for permission set/clear." 2014-05-14 12:43:58 +00:00
Lorenzo Colitti
02af9da5a9 Merge "Update netd interface" 2014-05-14 12:43:45 +00:00
Lorenzo Colitti
afabcf8641 Merge "Add multinetwork netd calls" 2014-05-14 12:43:27 +00:00
Lorenzo Colitti
807913fec5 Merge "Stop adding host routes for dns" 2014-05-14 12:43:19 +00:00
Jorim Jaggi
67c26cba21 Merge "Handle media key events correctly on Keyguard." 2014-05-14 12:35:46 +00:00
Jorim Jaggi
df993513fb Handle media key events correctly on Keyguard. 
Bug: 14490267
Change-Id: Ib8f8ee3ee7f1fbec70f1dd8b6fb04cd7c242bdce
 2014-05-14 14:32:50 +02:00
Jorim Jaggi
fae5984758 Merge "Fix Keyboard over Keyguard when password is set." 2014-05-14 12:28:14 +00:00
Jorim Jaggi
5fd4d05aae Fix Keyboard over Keyguard when password is set. 
Bug: 14842750
Change-Id: Ie7d92ee60191f8083c8ff65aba3754c71e4a5819
 2014-05-14 14:03:37 +02:00
Alexandra Gherghina
ef7f57d5ff Merge "Ensure only enabled profile apps can be launched" 2014-05-14 11:59:45 +00:00
Alexandra Gherghina
cea2978737 Ensure only enabled profile apps can be launched 
Change-Id: I396e99eb6b8a957d994962300eeffeec61d7c46a
Bug: 13691041
 2014-05-14 12:31:21 +01:00
Robert Greenwalt
12e6735f77 Handle legacy synchronous inspectors 
getNetworkInfo, getActiveNetworkInfo, etc

Conflicts:
	services/core/java/com/android/server/ConnectivityService.java

Change-Id: I4611d6481b1a76fe4a4ce22232a2a329de2a6e0c
 2014-05-14 03:56:35 -07:00
Paul Jensen
3b75982e39 Get clatd/Nat464Xlat working with new NetworkAgents. 
Change-Id: I65dfb59ce519a42bdb872940d229039b5403fd92
 2014-05-14 03:56:35 -07:00
Lorenzo Colitti
7ef9257601 Fix compile errors after merge. 
These are due to changes to ConnectivityService that were made
after master-multinetwork-dev branched off. They mostly didn't
cause merge conflicts because they were in different parts of
the file from the multinetwork changes, but they cause compile
errors now. These particular changes should be fine - they are
all in dead code anyway, and their functionality had already
been re-implemented in the new code.

Change-Id: I0ac9e39c3c975c8e8dc04ad11b6b85366693865c
 2014-05-14 03:56:34 -07:00
Paul Jensen
b6bb6c61dd Disable calls to MobileDataStateTracker.isProvisioning() as there is no more 
MobileDataStateTracker so these just crash.

Change-Id: Ib45a85db505c0a99fb65d9a6d0c39b860f9d019d
 2014-05-14 03:56:34 -07:00
Paul Jensen
ca8f16ad14 Add NetworkMonitor. 
At present the network evaluation / captive portal detection
is disabled pending addition of API to bind socket to network.

Change-Id: I5d1f5dc86d4dd9481d52dd45d6da0732054c8315
 2014-05-14 03:56:34 -07:00
Paul Jensen
992f252579 Separate network and interface addition/removal netd APIs. 
This should facilitate stacked interfaces (i.e. clatd).

Change-Id: Ib3e7a4d3847ef6ec4449451f6da42e75959baa4f
 2014-05-14 03:56:34 -07:00