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

23504 Commits

Author SHA1 Message Date
Jinsuk Kim
c86f09d714 am 2dafe666: Merge "CEC: Enable log for non-user builds" into lmp-mr1-dev 
* commit '2dafe6664a7dd6d9aa227b0779a90891c2b1b2ef':
  CEC: Enable log for non-user builds
 2014-11-21 21:48:49 +00:00
Jeff Brown
682ed6b608 Merge "resolved conflicts for merge of 694c1d2b to lmp-mr1-dev" into lmp-mr1-dev 2014-11-21 21:48:47 +00:00
Jinsuk Kim
2dafe6664a Merge "CEC: Enable log for non-user builds" into lmp-mr1-dev 2014-11-21 21:43:23 +00:00
Jeff Brown
9ef9401938 resolved conflicts for merge of 694c1d2b to lmp-mr1-dev 
Change-Id: I9a9b724e0fd12aa161ff276540431b9d8e218e2b
 2014-11-21 21:35:08 +00:00
Jeff Davidson
11008a78b8 Don't enforce control permission when preparing consented VPN. 
If a VPN app requests to be prepared and has already obtained user
consent, there is no need to additionally enforce the control
permission. We only need to enforce the control permission when a VPN
is first being prepared, where such a preparation would bypass user
consent.

Also ensure that in this case, the VPN being prepared matches the
calling app. Otherwise an app could prepare another pre-consented VPN,
which is not particularly dangerous but is likely unexpected.

Finally, remove misleading comment in ConnectivityService#prepareVpn.
This method IS called from VpnService.prepare(), not only from
system-privileged apps.

Bug: 18442887
Change-Id: Ic3227c6c1c74312697f0576d3811b06692a4edff
 2014-11-21 12:56:29 -08:00
Jinsuk Kim
4d1189e283 CEC: Enable log for non-user builds 
This helps get better bugreports for dogfooding. Accompanying bug
will be kept track of to ensure the log is turned off before
shipping. See ag/175890 for reference.

Bug: 18471978
Change-Id: Ic67d64526fee3c52fee6c7f1e0201ead4ae6a3e7
 2014-11-22 04:25:20 +09:00
Jeff Sharkey
55a442e582 Lightweight checkin output for network stats. 
Define and print a compact version of network statistics when dump
is requested with the "--checkin" flag.  Defaults to last 24 hours,
but included data can be tweaked with various flags.

Groups together detailed network identities into larger umbrella
terms like "mobile" and "wifi."

Bug: 18415963
Change-Id: I70cf9c828ea5c6e5bb6884837d3608f66fbad2e6
 2014-11-21 10:11:10 -08:00
Sreeram Ramachandran
c2c0beab79 Allow VPNs to specify their underlying networks. 
These are used when responding to getActiveNetworkInfo() (and cousins)
when an app is subject to the VPN.

Bug: 17460017
Change-Id: Ief7a840c760777a41d3358aa6b8e4cdd99c29f24
 2014-11-21 09:26:18 -08:00
Selim Cinek
9c4a707912 Fixed several time related states for secondary users 
The 24 hour setting was not respected correctly. Also
fixed a bug where the next alarm would not display itself
in the QS panel.

Bug: 16239208
Change-Id: I89734f783912dead5831db49db53fba04dbf54ee
 2014-11-21 18:25:30 +01:00
Sreeram Ramachandran
75f018e6a7 Delete unused/non-working code. 
Change-Id: I2cba9ffdb4ed547cb922d0ac08abf81e49ffa66b
 2014-11-21 08:08:19 -08:00
Sreeram Ramachandran
21b5ee3f0e Eliminate race conditions in UID-based network filtering. 
The previous code retrieved information from the legacy tracker multiple
times for each user query, leading to race conditions where the info
could've changed between the calls.

Refactors the handling of legacy data types in ConnectivityService and
unifies call paths so that APIs that deal with legacy data types
(NetworkInfo and int/networkType) and newer types (such as Network) go
through common code paths, using NetworkState to hold all the necessary
data pieces. This enables follow-on bug fixes to getActiveNetworkInfo().

The changes are limited to public "query" APIs (those that retrieve some
network information or the other). More details about the specific
changes and their rationale can be found in the code review thread.

Bug: 17460017
Change-Id: I656ee7eddf2b8cace5627036452bb5748043406c
 2014-11-21 08:07:13 -08:00
Zoltan Szatmary-Ban
ffba290a33 am 5c374a58: am b3d0580f: am 08229e81: Merge "Shutdown backup manager service when device owner is set" into lmp-mr1-dev 
* commit '5c374a582ceff913e420d21d63e1d7b087d6fc56':
  Shutdown backup manager service when device owner is set
 2014-11-21 15:31:49 +00:00
Zoltan Szatmary-Ban
ce2552d980 am 99d983b0: am 07334334: Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev automerge: b3e8ff0 
* commit '99d983b0860272c2edf4e2585995ec064e759b6b':
  Adding method to query backup manager service activity status
 2014-11-21 15:31:44 +00:00
Zoltan Szatmary-Ban
5c374a582c am b3d0580f: am 08229e81: Merge "Shutdown backup manager service when device owner is set" into lmp-mr1-dev 
* commit 'b3d0580f0fa126c258c54e8007ea8d51ed12810f':
  Shutdown backup manager service when device owner is set
 2014-11-21 15:28:20 +00:00
Zoltan Szatmary-Ban
99d983b086 am 07334334: Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev 
automerge: b3e8ff0

* commit 'b3e8ff00c85f37686a45597636d546a5e2a32c26':
  Adding method to query backup manager service activity status
 2014-11-21 15:26:51 +00:00
Zoltan Szatmary-Ban
b3d0580f0f am 08229e81: Merge "Shutdown backup manager service when device owner is set" into lmp-mr1-dev 
* commit '08229e817ecb67b0c7ebbd6b5b9ce4aef1b38cc2':
  Shutdown backup manager service when device owner is set
 2014-11-21 15:24:39 +00:00
Zoltan Szatmary-Ban
b3e8ff00c8 am 07334334: Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev 
* commit '07334334aab3863408325653ceccee47f9e1788d':
  Adding method to query backup manager service activity status
 2014-11-21 15:24:33 +00:00
Zoltan Szatmary-Ban
08229e817e Merge "Shutdown backup manager service when device owner is set" into lmp-mr1-dev 2014-11-21 15:21:07 +00:00
Zoltan Szatmary-Ban
07334334aa Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev 2014-11-21 15:20:47 +00:00
Adrian Roos
7e2e40e127 Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045 
Fix log spam and wrong log string.

Bug: 18414067
Change-Id: I588ec7b62055d2374d311d3adf9edd500ca40380
 2014-11-21 15:27:12 +01:00
Paul Jensen
6b0de80083 am 416a0b1c: am 0653f508: Merge "Don\'t allow an uncreated Network to satsify requests." into lmp-mr1-dev automerge: 934b73f 
* commit '416a0b1cc9c14039992799510808f24e7f03a99b':
  Don't allow an uncreated Network to satsify requests.
 2014-11-21 12:54:59 +00:00
Paul Jensen
416a0b1cc9 am 0653f508: Merge "Don\'t allow an uncreated Network to satsify requests." into lmp-mr1-dev 
automerge: 934b73f

* commit '934b73fb50afd4280a1b6a509376ca86424fa7b2':
  Don't allow an uncreated Network to satsify requests.
 2014-11-21 12:50:35 +00:00
Paul Jensen
934b73fb50 am 0653f508: Merge "Don\'t allow an uncreated Network to satsify requests." into lmp-mr1-dev 
* commit '0653f508b58eab994089ae2da783852a5c1b4a8a':
  Don't allow an uncreated Network to satsify requests.
 2014-11-21 12:47:23 +00:00
Paul Jensen
0653f508b5 Merge "Don't allow an uncreated Network to satsify requests." into lmp-mr1-dev 2014-11-21 12:42:34 +00:00
Adrian Roos
f8f56bce42 Fix DPM.resetPassword("") 
While we're at it, also fix some multi-user issues in
LockPatternUtils.

Bug: 17496766
Change-Id: I8e557ea640fa589817c8f8f818c91463585d5ea7
 2014-11-21 13:34:06 +01:00
Geoffrey Borggaard
9a5974734f am e400f811: am 8a2ac41d: am e548c3a3: am c3f5d718: Merge "Fix null handling in proxies." into lmp-dev automerge: 90ed95f 
* commit 'e400f811f28fbf8b6055b9efc8afbee11ba08f67':
  Fix null handling in proxies.
 2014-11-21 12:20:00 +00:00
Christopher Tate
972b140745 am 5b0528b5: am b2b8dcba: am ad064d48: Merge "Recents backup helper" into lmp-mr1-dev 
* commit '5b0528b5e1374cbb55169d81ab83f866b3e127be':
  Recents backup helper
 2014-11-21 12:18:31 +00:00
Erik Kline
6772a8754d am 30246e3d: am 4e9ea5e9: Merge "Rename EXTRA_NETWORK ConnectivityManager constants." into lmp-mr1-dev automerge: dedd42a 
* commit '30246e3d3782c2f95289e352c1a17dd1314ab660':
  Rename EXTRA_NETWORK ConnectivityManager constants.
 2014-11-21 12:17:38 +00:00
Geoffrey Borggaard
e400f811f2 am 8a2ac41d: am e548c3a3: am c3f5d718: Merge "Fix null handling in proxies." into lmp-dev automerge: 90ed95f 
* commit '8a2ac41dcfa0ec10c09a7599d9345798c21cd47d':
  Fix null handling in proxies.
 2014-11-21 10:31:03 +00:00
Geoffrey Borggaard
8a2ac41dcf am e548c3a3: am c3f5d718: Merge "Fix null handling in proxies." into lmp-dev automerge: 90ed95f 
* commit 'e548c3a3786a252d42b3c0ae0823f4718fcb9718':
  Fix null handling in proxies.
 2014-11-21 10:25:37 +00:00
Geoffrey Borggaard
e548c3a378 am c3f5d718: Merge "Fix null handling in proxies." into lmp-dev 
automerge: 90ed95f

* commit '90ed95faeddf7ebe71320e3e0e80eb17d374e49c':
  Fix null handling in proxies.
 2014-11-21 10:17:39 +00:00
Christopher Tate
5b0528b5e1 am b2b8dcba: am ad064d48: Merge "Recents backup helper" into lmp-mr1-dev 
* commit 'b2b8dcba2c623f52ebe166ad68bff5f6a34bf25a':
  Recents backup helper
 2014-11-21 03:09:06 +00:00
Adrian Roos
4d4254fdc3 am 2a5663d5: am 4e312d81: Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev automerge: 62a7d53 
* commit '2a5663d524a29cc33137a6651660506398d0633a':
  Add device locked API for TrustAgentService
 2014-11-21 02:58:07 +00:00
Adrian Roos
05576cc784 am cf047b5d: am af6e657a: Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev automerge: 866bae5 
* commit 'cf047b5d554b35e504f33994f3a07624c2690633':
  Update KeyguardManager.isDeviceLocked API
 2014-11-21 02:58:00 +00:00
Craig Mautner
b1ff9cc788 am 117f0c15: am 25418aab: Merge "Ensure arraylist index is montonically decreasing" into lmp-mr1-dev automerge: 9bb16f5 
* commit '117f0c15f7d534afeed20d8e14be8a83f8062f72':
  Ensure arraylist index is montonically decreasing
 2014-11-21 02:57:38 +00:00
Wink Saville
b638b35757 am 49414b5b: am 816e19eb: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev automerge: 1caab41 
* commit '49414b5b2129bf72a847c64a9f83e7b7db4511c0':
  Revert "Additional changes to SubscriptionManager API as per API council."
 2014-11-21 02:57:27 +00:00
Erik Kline
30246e3d37 am 4e9ea5e9: Merge "Rename EXTRA_NETWORK ConnectivityManager constants." into lmp-mr1-dev 
automerge: dedd42a

* commit 'dedd42a2bdfafd6195d793949766d1c53f80ae51':
  Rename EXTRA_NETWORK ConnectivityManager constants.
 2014-11-21 02:57:09 +00:00
Wink Saville
771e952ebc am 07fb2457: am 4a57e908: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev automerge: 68c21d6 
* commit '07fb24576a5a425798a2aa004dd49682f414cbf7':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-21 02:56:45 +00:00
Adrian Roos
2a5663d524 am 4e312d81: Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev 
automerge: 62a7d53

* commit '62a7d5334315b4153f1da1112f945d13f72e0381':
  Add device locked API for TrustAgentService
 2014-11-21 02:47:16 +00:00
Adrian Roos
cf047b5d55 am af6e657a: Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev 
automerge: 866bae5

* commit '866bae50b7e8f0389b67df54eaf829fa50bc8eaf':
  Update KeyguardManager.isDeviceLocked API
 2014-11-21 02:46:16 +00:00
Craig Mautner
117f0c15f7 am 25418aab: Merge "Ensure arraylist index is montonically decreasing" into lmp-mr1-dev 
automerge: 9bb16f5

* commit '9bb16f55e80afaeb6700af9fc97a58a8b3309412':
  Ensure arraylist index is montonically decreasing
 2014-11-21 02:44:31 +00:00
Wink Saville
49414b5b21 am 816e19eb: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev 
automerge: 1caab41

* commit '1caab41f31b2fd1129dff58fc678361b691af9db':
  Revert "Additional changes to SubscriptionManager API as per API council."
 2014-11-21 02:41:53 +00:00
Wink Saville
07fb24576a am 4a57e908: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 
automerge: 68c21d6

* commit '68c21d6736a2ec54d36c8b33b815062c568e4707':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-21 02:39:23 +00:00
Christopher Tate
b2b8dcba2c am ad064d48: Merge "Recents backup helper" into lmp-mr1-dev 
* commit 'ad064d48adcfac71bd04d9f3bb5ea9d607d132a7':
  Recents backup helper
 2014-11-21 02:30:11 +00:00
Christopher Tate
ad064d48ad Merge "Recents backup helper" into lmp-mr1-dev 2014-11-21 02:24:31 +00:00
Paul Jensen
2c311d61ea Don't bother validating networks that don't satisfy the default request. 
The only immediate change in behavior is not validating untrusted networks.

bug:18299572
bug:18394654

Change-Id: I8d626baf37db0bd0f55ddf3af8a0abf094a12369
 2014-11-20 21:00:35 -05:00
Jae Seo
1c10503c4c am 89d8fb55: am 7edaf55a: Merge "TIF: fix setSurface() logic" into lmp-mr1-dev 
automerge: 71bda35

* commit '71bda351510330c1a6c21474f518fa2f53bf4794':
  TIF: fix setSurface() logic
 2014-11-21 01:57:46 +00:00
Geoffrey Borggaard
6c70cde9d2 am c2af9be6: am bfab323c: Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-mr1-dev 
automerge: aba9aba

* commit 'aba9abaefabf9b78c3df4b0ce01aa52184b34764':
  Setting ADB_ENABLED may result in a SecurityException.
 2014-11-21 01:55:15 +00:00
Dianne Hackborn
f8c3691425 am 42fec57f: am d9968438: Merge "Fix issue with call backs from media process." into lmp-mr1-dev 
automerge: 377d6f0

* commit '377d6f00dc2ab42df501fd12b23e1dab54cea6b7':
  Fix issue with call backs from media process.
 2014-11-21 01:52:23 +00:00
RoboErik
24228295e2 am 3ef3a9bf: am ac4af18b: Merge "Handle volume events on master volume devices correctly" into lmp-mr1-dev 
automerge: bbf0f66

* commit 'bbf0f662a8a54e6c8c49a58b7a7273fe8756ff45':
  Handle volume events on master volume devices correctly
 2014-11-21 01:49:48 +00:00