Commit Graph

340 Commits

Author SHA1 Message Date
The Android Automerger
c8c2da1d00 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-11-16 11:29:29 -08:00
The Android Automerger
29e0ddac72 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-11-14 11:28:16 -08:00
Jeff Sharkey
526438dbe6 Useful annotations for code documentation.
Bug: 6537978
Change-Id: I806c3c09e3255f8789455f13bf37c1dde2a93f1f
2012-11-12 12:42:17 -08:00
The Android Open Source Project
8d5f8e2b7b Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I72634b08506c4fed29edd474553cb416dce9cc8e
2012-11-06 12:17:05 -08:00
The Android Automerger
9f62b71346 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-11-06 02:25:30 -08:00
The Android Automerger
d81cd2fe45 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-02 17:34:34 -07:00
Jeff Sharkey
3a8abe7eec Sanity check network stats coming from disk.
Throw early when structure is unstable, which allows the normal
recoverFromWtf() path to recover automatically.

Bug: 7440485
Change-Id: Ic150d17daac4de7c9ff3489025403a9b485b4620
2012-11-02 15:38:15 -07:00
The Android Automerger
42644faf88 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-28 06:59:29 -07:00
Jeff Sharkey
c783695df2 Migrate more Secure settings to Global.
Migrate networking, storage, battery, DropBox, and PackageManager
related Secure settings to Global table.

Bug: 7232014, 7231331, 7231198
Change-Id: I772c2a9586a2f708c9db95622477f235064b8f4d
2012-09-27 16:22:53 -07:00
The Android Automerger
1b044270f3 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-20 06:59:44 -07:00
Jeff Sharkey
8c8309a6fe Migrate network stats from removed users.
When a user is removed, migrate all network stats belonging to that
user into special UID_REMOVED bucket.  Also removes those stats from
kernel to avoid double-counting if another user is created.

Bug: 7194784
Change-Id: I03f1d660fe3754566326b7749cae8068fc224ea9
2012-09-19 14:54:05 -07:00
The Android Automerger
71234dc56e merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-14 14:10:27 -07:00
Jeff Sharkey
77127d1c93 Actually move to Global settings.
Also add better ConnectivityService logging.

Bug: 7157464
Change-Id: Ia235a7e62ed809240913c4782920c1410c7d597d
2012-09-14 13:47:51 -07:00
Jeff Sharkey
633746dc75 Move to Global.NETSTATS and Global.NTP constants.
Bug: 7157464
Change-Id: Ief10fd37940f62420f5684940994c9f93802e0be
2012-09-14 13:14:21 -07:00
The Android Automerger
fb8de3e2b5 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-03 06:33:59 -07:00
Dianne Hackborn
692107e827 Improve multi-user broadcasts.
You can now use ALL and CURRENT when sending broadcasts, to specify
where the broadcast goes.

Sticky broadcasts are now correctly separated per user, and registered
receivers are filtered based on the requested target user.

New Context APIs for more kinds of sending broadcasts as users.

Updating a bunch of system code that sends broadcasts to explicitly
specify which user the broadcast goes to.

Made a single version of the code for interpreting the requested
target user ID that all entries to activity manager (start activity,
send broadcast, start service) use.

Change-Id: Ie29f02dd5242ef8c8fa56c54593a315cd2574e1c
2012-08-30 14:33:22 -07:00
The Android Automerger
70cf63b19d merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-07 06:34:26 -07:00
Jeff Sharkey
0066733be0 Make generic BaseNetworkObserver.
This makes it easier to add new INetworkManagementEventObserver events
in future.

Change-Id: I432263d745558de4b878f313c1951230ed9db2b1
2012-08-05 14:32:41 -07:00
The Android Automerger
6ddcc4a07e merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-02 07:16:57 -07:00
The Android Automerger
90400390cf merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-01 07:10:35 -07:00
Dianne Hackborn
4e61e3f8d3 Merge "Make AtomicFile a public API. It's about time!" into jb-mr1-dev 2012-07-31 18:11:03 -07:00
Dianne Hackborn
3dfb8b498a Make AtomicFile a public API. It's about time!
Change-Id: Ib34e294747405b7ab709cb0bbb2d9a0cc80ce86a
2012-07-31 17:54:52 -07:00
Jeff Sharkey
e1cf73eb69 Revert "API to adjust network stats." 2012-07-31 17:11:07 -07:00
Jeff Sharkey
6615400fe8 API to adjust network stats. DO NOT MERGE.
Enables system apps to correctly account network usage performed on
behalf of another application.

Bug: 6695246
Change-Id: I39e243afd57936b6b30157a6ca511a17b6c55c39
2012-07-31 11:45:17 -07:00
The Android Automerger
efbd30abc6 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-07-30 09:46:04 -07:00
Jeff Sharkey
0dbcedeece API to adjust network stats.
Enables system apps to correctly account network usage performed on
behalf of another application.

Bug: 6695246
Change-Id: I39e243afd57936b6b30157a6ca511a17b6c55c39
2012-07-27 17:47:21 -07:00
Jean-Baptiste Queru
e94ac8b67e am 1fe7a813: (-s ours) Merge "Enhance StateMachine Quitting and logging support. DO NOT MERGE" into jb-dev-plus-aosp
* commit '1fe7a81383a0b7c87be2cc4291e1ede9d85bf819':
  Enhance StateMachine Quitting and logging support. DO NOT MERGE
2012-07-02 14:50:47 -07:00
Wink Saville
66f04e9ddb Enhance StateMachine Quitting and logging support. DO NOT MERGE
Make StateMachine#quit non-conditional and remove the need to
process the SM_QUIT_CMD it is now private.

Rename halting to onHalting.

Add onQuitting

Change the message specific logging to be more generic and change
the xxxProcessedMessagesYyy methods to xxxLogRecXyy names. Also add
addLogRec(String) and addLogRec(String, State) as the generic logging
methods.

bug: 5678189
Change-Id: I22f66d11828bfd70498db625fe1be728b90478b7

Conflicts:

	services/java/com/android/server/NsdService.java
2012-07-02 10:57:11 -07:00
Robert Greenwalt
1819c4f10e Merge "Fix a sync problem in NativeDaemonConnector." 2012-06-07 11:37:15 -07:00
Robert Greenwalt
610bc9678d Fix a sync problem in NativeDaemonConnector.
We had a gap in sync coverage between doing a check and waiting and a
matching gap between setting a condition and notifying.  It was possible
to get context switched just so and have the notify hit before the waiter
had started waiting.

bug:6492166
Change-Id: Idc876cf85b35902a79fae932547957ed5ef00e4f
2012-06-07 11:22:54 -07:00
The Android Open Source Project
7cf507222a am 5418b476: Reconcile with jb-release nakasi-factoryrom-release
* commit '5418b476be6bc998fe1de7cefe1fe61453cb7f50':
  Always queue A2DP connection state message with wakelock held
  Adding more logging for bug: 6499508
  Fix bug 6558006: SystemUI native heap is huge. Fix memory leak
  Fix build.
  Revert "Make the protectionLevel of framework permissions consistent and related to sensitive user data. Dangerous permissions are applied only where sensitive user data may be exposed."
  Survey says: NIET!
  Fix 6580421: make sure MultiWaveView.reset() makes handle visible
  Fix issue #6579824: Email crash observed after updating...
  Fix 6398209: SearchPanel gesture improvements
2012-06-07 07:55:38 -07:00
The Android Open Source Project
5418b476be Reconcile with jb-release nakasi-factoryrom-release
Change-Id: Ibd5be536b10a8df19d365da267d2ad46b84dc14c
2012-06-07 07:49:05 -07:00
Irfan Sheriff
a481387a1f resolved conflicts for merge of 43996db6 to master
Change-Id: Icb13c37491d3e9f0252198f98d8110740fa1f997
2012-06-05 09:49:24 -07:00
The Android Automerger
0918c0ff7b merge in jb-release history after reset to jb-dev 2012-06-05 06:52:32 -07:00
Irfan Sheriff
43996db6ea am 5751f816: Merge "Add contentobserver for nsd_on setting" into jb-dev
* commit '5751f816f06454ea48bc25f56051878e0ce82dc1':
  Add contentobserver for nsd_on setting
2012-06-04 22:55:21 -07:00
Irfan Sheriff
67c80edfab Add contentobserver for nsd_on setting
Bug: 6606274
Change-Id: I863b9e2a2446d697f3c9c49f24dcdc2b599f091e
2012-06-04 15:54:30 -07:00
Wink Saville
cb9495551c Merge "Enhance StateMachine Quitting and logging support." 2012-05-29 14:22:50 -07:00
Wink Saville
358f5d40b1 Enhance StateMachine Quitting and logging support.
Make StateMachine#quit non-conditional and remove the need to
process the SM_QUIT_CMD it is now private.

Rename halting to onHalting.

Add onQuitting

Change the message specific logging to be more generic and change
the xxxProcessedMessagesYyy methods to xxxLogRecXyy names. Also add
addLogRec(String) and addLogRec(String, State) as the generic logging
methods.


bug: 5678189
Change-Id: I22f66d11828bfd70498db625fe1be728b90478b7
2012-05-29 12:40:46 -07:00
The Android Open Source Project
a7583f6986 Reconcile with jb-release nakasi-factoryrom-release
Change-Id: I2b5e77195eae1a9676c2530a9023290936e55255
2012-05-29 09:39:33 -07:00
The Android Automerger
1dfd22364b merge in jb-release history after reset to jb-dev 2012-05-29 08:58:07 -07:00
Robert Greenwalt
0883995604 am 1ed1de7a: Merge "Modify logging to debug this issue" into jb-dev
* commit '1ed1de7ab2ae03f82500dbf6272bf036d89bd0c9':
  Modify logging to debug this issue
2012-05-24 12:30:20 -07:00
Robert Greenwalt
6c37b32a26 Modify logging to debug this issue
Logging exec time on startUsingNetworkFeature as we've had some reports suggesting it's
causing ANRs.
Remove some logging from NDC so it's local log is more useful.

bug:6492166
Change-Id: I258ff6c59bff2c65935242d50496d84720c5d493
2012-05-24 10:47:10 -07:00
The Android Open Source Project
9e584f2cfb Reconcile with jb-release
Change-Id: I68d329b7abda2aedfd3fd98419f3b3167ccfbc2a
2012-05-22 13:05:14 -07:00
The Android Automerger
91afb93bbe merge in jb-release history after reset to jb-dev 2012-05-20 07:39:45 -07:00
The Android Automerger
4e92d01b59 merge in jb-release history after reset to jb-dev 2012-05-19 11:42:49 -07:00
The Android Automerger
6c4f7e570f merge in jb-release history after reset to jb-dev 2012-05-19 10:05:49 -07:00
The Android Open Source Project
59bdfd1baa Reconcile with jb-release nakasi-factoryrom-release
Change-Id: Iee6bef177dbec906e617d85f0c508d80e77eb64c
2012-05-18 18:42:17 -07:00
Jeff Sharkey
88ee087ed7 am eac31d5b: Merge "Transition from DEV network stats to XT." into jb-dev
* commit 'eac31d5b9d9b346ce36c9790af864d3224e0524d':
  Transition from DEV network stats to XT.
2012-05-18 15:59:46 -07:00
Jeff Sharkey
eac31d5b9d Merge "Transition from DEV network stats to XT." into jb-dev 2012-05-18 11:40:42 -07:00
Jeff Sharkey
3ddc9b3745 Transition from DEV network stats to XT.
When XT stats are available, transition to prefer them over DEV,
since they aren't subject to hardware driver bugs.  Only switches at
the first atomic XT bucket, and adds a Settings.Secure flag to force
back to DEV if needed.  Includes tests to cover transition.

Fix tests where device overlay would change which network types
reflected data usage.  Test both history and summary APIs.  Fixed
collection timestamps to reflect full buckets.

Bug: 6504744
Change-Id: Idd7f3b2fdb064c36547c85c51c214fd938c59b7e
2012-05-17 10:10:39 -07:00