Commit Graph

3312 Commits

Author SHA1 Message Date
Jeff Sharkey
8a6d69a6f6 am 233698fe: am 3a8af8ef: Merge "Migrate more Secure settings to Global." into jb-mr1-dev
* commit '233698fe0e3d4be8582c90bc47c9a104df1fa6f0':
  Migrate more Secure settings to Global.
2012-09-28 00:36:41 -07:00
Jeff Sharkey
233698fe0e am 3a8af8ef: Merge "Migrate more Secure settings to Global." into jb-mr1-dev
* commit '3a8af8efff93ca8ee80fc8c7841e7bee9a8b7786':
  Migrate more Secure settings to Global.
2012-09-27 19:33:38 -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 Open Source Project
93766baed3 am e7e41f55: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'e7e41f555cee85c8bca2cfeaf16a9bab9ba38174':
  Disable content observer cross-user permission checks...
  Disable content observer cross-user permission checks...
  Fix deadlock in LockPatternUtils by using local id.
  Compute GradientDrawable's opacity correctly
  Tweaking how settings adds keyguard widgets
  Settings provider needs to send notifications as itself
  Visualizer only works on sounds >5 sec.
  dodging the @JavascriptInterface bullet
  Fix crash in recents
  Wait for installd to finish starting before booting.
  Temporarily turn off package verification
2012-09-24 10:14:52 -07:00
The Android Open Source Project
e7e41f555c Reconcile with jb-mr1-release - do not merge
Change-Id: I37715a9d2489d282d09a60cf32d92f13c3d82b13
2012-09-24 10:12:10 -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
c1051b74f1 am 8f9bdaba: am c3e3311c: Merge "Migrate network stats from removed users." into jb-mr1-dev
* commit '8f9bdabafc2a2c0c9d2098c30ffd84029057c7cf':
  Migrate network stats from removed users.
2012-09-20 06:17:38 -07:00
Jeff Sharkey
8f9bdabafc am c3e3311c: Merge "Migrate network stats from removed users." into jb-mr1-dev
* commit 'c3e3311c050f47a229e1b49f1fdf685669d79d53':
  Migrate network stats from removed users.
2012-09-20 06:09:01 -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
Jeff Sharkey
1ece2dc193 am 9e52673e: am 04a34b37: Merge "Actually move to Global settings." into jb-mr1-dev
* commit '9e52673e90c861c42d6b46527282aba166d66716':
  Actually move to Global settings.
2012-09-17 11:10:16 -07:00
Jeff Sharkey
ab148b26ee am eb92325f: am a043c2c0: Merge "Move to Global.NETSTATS and Global.NTP constants." into jb-mr1-dev
* commit 'eb92325f0e6bbf9e3c0867fd4e741f4e08dd6900':
  Move to Global.NETSTATS and Global.NTP constants.
2012-09-17 11:10: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
9e52673e90 am 04a34b37: Merge "Actually move to Global settings." into jb-mr1-dev
* commit '04a34b375513eaeec67f54bb203ef6b763328751':
  Actually move to Global settings.
2012-09-14 13:51:10 -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
eb92325f0e am a043c2c0: Merge "Move to Global.NETSTATS and Global.NTP constants." into jb-mr1-dev
* commit 'a043c2c0534afe418fc39bdb43bfaab394ba821a':
  Move to Global.NETSTATS and Global.NTP constants.
2012-09-14 13:17:38 -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 Open Source Project
6248d3a3f5 am dc113640: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'dc11364026c7b2cf70c1d5993cc703b132c44cfe':
  Convert resized() method to new parameters.
  Don't depend on LockPatternUtils to get DevicePolicyManager
  Fix issue #7097984 java.lang.SecurityException: Permission Denial:
  Work around instability of Display.getRotation().
  GestureDetector - Mask action when checking POINTER_UP
  Turn off deadzone flash, replacing it with logcat.
  Fixed MemoryUsage issue with reporting results.
  Use focal point for scrolling in GestureDetector
  Fix keyguard layout on tablet
  Check proximity detector before powering off.
  Fix PendingIntent caching for multiuser
  Fix adb install
2012-09-10 17:07:21 -07:00
The Android Open Source Project
dc11364026 Reconcile with jb-mr1-release - do not merge
Change-Id: I78543f98dd668123d26915177c2c65ed01b9d2be
2012-09-07 15:03:50 -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
e5f4b20a65 am 6c51b02d: am 73365695: Merge "Improve multi-user broadcasts." into jb-mr1-dev
* commit '6c51b02db45d97ab12925fe3d4614fb25ac80358':
  Improve multi-user broadcasts.
2012-08-30 15:01:28 -07:00
Dianne Hackborn
6c51b02db4 am 73365695: Merge "Improve multi-user broadcasts." into jb-mr1-dev
* commit '73365695e4d169126c6932df8e8e932aefe6aaca':
  Improve multi-user broadcasts.
2012-08-30 14:58:23 -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
Vairavan Srinivasan
6ce481864a NsdService: Clear client info after resolution request is serviced.
Currently, the client requests tracked in mClientIds for resolution
requests isn't cleared at all and causes failues of additional registration
and discovery requests once the number of requests reaches MAX_LIMIT. In
addition, bubble up unhandled native events to default state of nsd state
machine.

Change-Id: Ief14e0fff644aa2698fcddd71f538820f802be58
2012-08-23 20:24:43 -07:00
The Android Open Source Project
5e3f227e91 am 7c41b0f4: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '7c41b0f446f1309c37e96438dac2555917fe1f53':
2012-08-07 11:05:57 -07:00
The Android Open Source Project
7c41b0f446 Reconcile with jb-mr1-release - do not merge
Change-Id: Ieb696e80156846e1396e3508347bc02c01b9553e
2012-08-07 11:03:33 -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
5de3033128 am 66762a4b: am bec1d13d: Merge "Make generic BaseNetworkObserver." into jb-mr1-dev
* commit '66762a4beecef40a67766c92e4e7b7c825c55871':
  Make generic BaseNetworkObserver.
2012-08-05 15:02:22 -07:00
Jeff Sharkey
66762a4bee am bec1d13d: Merge "Make generic BaseNetworkObserver." into jb-mr1-dev
* commit 'bec1d13da2ef3c8c2c4cc4f740474d095068bd8b':
  Make generic BaseNetworkObserver.
2012-08-05 15:00:25 -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 Open Source Project
01f445f6fd am 3f24f7c5: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '3f24f7c510ba1dc68fb1dba460d5792c86924282':
  Venetian blinds policy for one-finger notification expansion.
2012-08-03 14:00:09 -07:00
The Android Open Source Project
3f24f7c510 Reconcile with jb-mr1-release - do not merge
Change-Id: Id4ed97d910fb1a57271ac4dd2ba530e047242003
2012-08-03 13:56:30 -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 Open Source Project
66d71e1df3 am d56b647d: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'd56b647d674234afb12529dda3027b607c37f904':
2012-08-01 15:15:48 -07:00
The Android Open Source Project
d56b647d67 Reconcile with jb-mr1-release - do not merge
Change-Id: I2a14632780e1a82c04a53ef60c7e4040a4fe0653
2012-08-01 15:13:34 -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
c660925a37 am 2c5a4b3d: am 4e61e3f8: Merge "Make AtomicFile a public API. It\'s about time!" into jb-mr1-dev
* commit '2c5a4b3d9e2fdd87ec727e514203143f77dd1595':
  Make AtomicFile a public API.  It's about time!
2012-07-31 18:15:26 -07:00
Dianne Hackborn
2c5a4b3d9e am 4e61e3f8: Merge "Make AtomicFile a public API. It\'s about time!" into jb-mr1-dev
* commit '4e61e3f8d3992597bb1f4d0a0e27f3c0049311a8':
  Make AtomicFile a public API.  It's about time!
2012-07-31 18:13:38 -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
651f772f4f am 12afb1cf: am e1cf73eb: Revert "API to adjust network stats."
* commit '12afb1cfcc3a66189f8ecf83573a7ed7df63343e':
  Revert "API to adjust network stats."
2012-07-31 17:23:00 -07:00
Jeff Sharkey
12afb1cfcc am e1cf73eb: Revert "API to adjust network stats."
* commit 'e1cf73eb6949117df598f5ba5b26439058f8adb5':
  Revert "API to adjust network stats."
2012-07-31 17:19:34 -07:00
Jeff Sharkey
e1cf73eb69 Revert "API to adjust network stats." 2012-07-31 17:11:07 -07:00
Jeff Sharkey
e29c9c4a5e am 0942c6f7: (-s ours) am 16ef5779: Merge "API to adjust network stats. DO NOT MERGE." into jb-mr1-dev
* commit '0942c6f705ef64e524335eaae27b3f6a91c2550c':
  API to adjust network stats. DO NOT MERGE.
2012-07-31 12:13:56 -07:00
Jeff Sharkey
0942c6f705 am 16ef5779: Merge "API to adjust network stats. DO NOT MERGE." into jb-mr1-dev
* commit '16ef57791766b92b8e34de4f752db2f522f34c82':
  API to adjust network stats. DO NOT MERGE.
2012-07-31 12:11:46 -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 Open Source Project
6f5215d3bf Revert "am a21a6075: Reconcile with jb-mr1-release"
This reverts commit 27a2c8495816553cbbf120af8096b9e9f01ed11c, reversing
changes made to 905272a439b396161a1e2368fa49e1747cb24143.
2012-07-31 10:58:38 -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