Commit Graph

2689 Commits

Author SHA1 Message Date
The Android Open Source Project
14418170ff Reconcile with jb-mr1.1-release - do not merge
Change-Id: Ib7a3e7b3af9ef848b763cf498c6757ad5658fc80
2012-11-29 15:41:04 -08:00
Kenny Root
ebdcabef44 am 49e27d5f: am ae0edeb3: am c88047bf: Merge "Move NTP updates outside locks"
* commit '49e27d5f9d77316350be6a119bad717d38ce5d95':
  Move NTP updates outside locks
2012-11-27 18:42:45 -08:00
Kenny Root
49e27d5f9d am ae0edeb3: am c88047bf: Merge "Move NTP updates outside locks"
* commit 'ae0edeb3e56c6aae113f8c5eaa3a03b79c00a93e':
  Move NTP updates outside locks
2012-11-27 13:00:01 -08:00
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
Jeff Sharkey
45dfdd6bc8 am 624a1eec: am bfea4f04: am f5377a72: Merge "Useful annotations for code documentation." into jb-mr1.1-dev
* commit '624a1eec46b507067e31f3d6979bb3758c8b65e1':
  Useful annotations for code documentation.
2012-11-16 10:37:59 -08:00
Anders 3 Fridlund
0e851c78e3 Move NTP updates outside locks
When the ServerThread handles ACTION_SHUTDOWN intent it sometimes get
stuck on mStatsLock in NetworkStatsService.java.
0  com.android.server.net.NetworkStatsService$5.onReceive()
1  android.app.LoadedApk$ReceiverDispatcher$Args.run()
2  android.os.Handler.handleCallback()
3  android.os.Handler.dispatchMessage()
4  android.os.Looper.loop()
5  com.android.server.ServerThread.run()
This happens when the NetworkStats thread is already holding the
mStatsLock while updating NTP.
0  libcore.io.Posix.getaddrinfo()
1  libcore.io.ForwardingOs.getaddrinfo()
2  java.net.InetAddress.lookupHostByName()
3  java.net.InetAddress.getAllByNameImpl()
4  java.net.InetAddress.getByName()
5  android.net.SntpClient.requestTime()
6  android.util.NtpTrustedTime.forceRefresh()
7  com.android.server.net.NetworkStatsService.performPoll()
8  com.android.server.net.NetworkStatsService.access$100()
9  com.android.server.net.NetworkStatsService$2.onReceive()
10 android.app.LoadedApk$ReceiverDispatcher$Args.run()
11 android.os.Handler.handleCallback()
12 android.os.Handler.dispatchMessage()
13 android.os.Looper.loop()
14 android.os.HandlerThread.run()
Since the NTP update consists of several socket operations it may get
stuck long enough to trigger a System Server Watchdog even though the
socket timeout is set to 20 second.
Further, the NTP update doesn't actually need to be performed inside
the locks and an attempt to change this was made earlier, but the code
wasn't actually moved outside the locks.

Change-Id: Ib37a2b8c2d51a01adb7ff01764f82309433703f0
2012-11-16 13:28:29 +01:00
Jeff Sharkey
624a1eec46 am bfea4f04: am f5377a72: Merge "Useful annotations for code documentation." into jb-mr1.1-dev
* commit 'bfea4f04f226f1adf374412628d5945c380382a7':
  Useful annotations for code documentation.
2012-11-15 11:56:19 -08:00
The Android Open Source Project
80fd441ee9 am 3e8ca675: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '3e8ca6759e6a3cde0c72bb9d1830cef8f77d5485':
2012-11-14 12:42:57 -08:00
The Android Open Source Project
3e8ca6759e Reconcile with jb-mr1.1-release - do not merge
Change-Id: I8bc0bebd74908751627e9e8e4100111b39e48710
2012-11-14 12:40:58 -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
a9be4f522d am cd3eb048: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit 'cd3eb048ced78a5790bc8626842a6b82c8db7812':
2012-11-06 12:40:19 -08:00
The Android Open Source Project
cd3eb048ce Reconcile with jb-mr1.1-release - do not merge
Change-Id: Iff336b51ffc2893168e67406d96bc6dd97735b7e
2012-11-06 12:37:23 -08:00
The Android Open Source Project
57f1ab2a25 am bb83b1c3: (-s ours) am 32477a8d: am 8d5f8e2b: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit 'bb83b1c34519b1598fef6ea3e750ea3e3dd51e18':
2012-11-06 12:31:22 -08:00
The Android Open Source Project
bb83b1c345 am 32477a8d: am 8d5f8e2b: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '32477a8dbf812795a19529d52c4ec2e079989cef':
2012-11-06 12:26:57 -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 Open Source Project
15ae30af72 am 5adafd52: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '5adafd52a0b5db71010e6d108e83214bce0af2c4':
2012-11-05 14:23:43 -08:00
The Android Open Source Project
5adafd52a0 Reconcile with jb-mr1-release - do not merge
Change-Id: Ib9f5712e4d1a5e0f0b4807cffda4769196c64c21
2012-11-05 14:21:22 -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
693779e4e9 am a49ee229: am 35d0dea3: am 1c743650: Merge "Sanity check network stats coming from disk." into jb-mr1-dev
* commit 'a49ee229138192aff86676da1d511cf4753ddba2':
  Sanity check network stats coming from disk.
2012-11-02 15:57:53 -07:00
Jeff Sharkey
a49ee22913 am 35d0dea3: am 1c743650: Merge "Sanity check network stats coming from disk." into jb-mr1-dev
* commit '35d0dea38bad69082f4153d9c335061a70fac4fc':
  Sanity check network stats coming from disk.
2012-11-02 15:54:50 -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
You Kim
0f1fea45d3 return value of String.replace() is ignored.
Change-Id: Id7330e1ffc9f429b22f153d8e644fa7c64354173
Signed-off-by: You Kim <you.kim72@gmail.com>
2012-10-28 23:57:57 +09:00
The Android Open Source Project
c651829236 am 477bc569: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '477bc569ccf5c4ed1a8910e9c07e08738e7f7eae':
  Fix bug #7259242 text is left justified with no padding
  DO NOT MERGE - Revert fixes for ImageView/MeasureSpec/RelativeLayout
  Quick reject empty paths
  Fix bug #7259242 text is left justified with no padding
  MediaRouter/Wifi Display improvements
  Status bar: Keep disabled state per user.
  ScaleGestureDetector does the safety dance.
  Adding missing file in previous change (Bug 7252771)
  Add wireless display selection support to MediaRouter.
  Fixing crash in QuickContacts. (Bug 7252771)
  temporarily disable blacklisting
  Revert "Do not use last app rotation as default."
  Revert "Fix adjustViewBounds handling for ImageView"
  Global gesture to toggle Accessibility system-wide.
  Fix perf regression from scale/density mismatch
  Plug memory leak that happens when reusing display lists Bug #7195815
  Don't use the QCOM_tiled_rendering extension with functors Bug #7247880
2012-10-02 09:21:24 -07:00
The Android Open Source Project
477bc569cc Reconcile with jb-mr1-release - do not merge
Change-Id: Ic7d71f0ada5470023de4dafc45024145d4d21a5b
2012-10-02 09:18:17 -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
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