Commit Graph

345 Commits

Author SHA1 Message Date
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
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
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