85038 Commits

Author SHA1 Message Date
Dianne Hackborn
b2dd4e87ae am 1a907db0: am 862c3835: am 4b60a8d1: Merge "Added check of ActivityInfo launch mode when starting activity."
* commit '1a907db07ea105ea65e146713f436ed072d7084b':
  Added check of ActivityInfo launch mode when starting activity.
2012-08-30 16:04:19 -07:00
Dianne Hackborn
1a907db07e am 862c3835: am 4b60a8d1: Merge "Added check of ActivityInfo launch mode when starting activity."
* commit '862c383530d64e6c493fb519f567dd5778d9d48c':
  Added check of ActivityInfo launch mode when starting activity.
2012-08-30 16:01:59 -07:00
rich cannings
d1b5cfc94a Notify verifiers that verification is complete
Send the Intent.ACTION_PACKAGE_VERIFIED to all verifiers when
verification is complete (either one verifier verified the package or a
timeout occurred). Details of what occurred is in a new extra,
PackageManager.EXTRA_VERIFICATION_RESULT.

Bug: 7048930
Change-Id: I4f9855a29b0eb6d77f469891402c69e2e8922945
2012-08-30 16:00:59 -07:00
Dianne Hackborn
862c383530 am 4b60a8d1: Merge "Added check of ActivityInfo launch mode when starting activity."
* commit '4b60a8d1b8b5f8fd04df5749ce225ed57e0a1a44':
  Added check of ActivityInfo launch mode when starting activity.
2012-08-30 15:59:40 -07:00
Romain Guy
6528cdca41 am 3dd72c6d: am 0fa814d7: Merge "Don\'t quickReject() children if FLAG_CLIP_CHILDREN isn\'t set" into jb-mr1-dev
* commit '3dd72c6db6d2051b67d7f953278ea770eebd1c73':
  Don't quickReject() children if FLAG_CLIP_CHILDREN isn't set
2012-08-30 15:31:56 -07:00
Romain Guy
3dd72c6db6 am 0fa814d7: Merge "Don\'t quickReject() children if FLAG_CLIP_CHILDREN isn\'t set" into jb-mr1-dev
* commit '0fa814d7e6d16e68fa715175cf3122b19fd9e59c':
  Don't quickReject() children if FLAG_CLIP_CHILDREN isn't set
2012-08-30 15:30:07 -07:00
Romain Guy
0fa814d7e6 Merge "Don't quickReject() children if FLAG_CLIP_CHILDREN isn't set" into jb-mr1-dev 2012-08-30 15:26:57 -07:00
Romain Guy
fbb4321b94 Don't quickReject() children if FLAG_CLIP_CHILDREN isn't set
External report: http://code.google.com/p/android/issues/detail?id=36788

Change-Id: Ibdaecf37ab013e30b16e9dc7a6e50156d72c3e4f
2012-08-30 15:19:27 -07:00
Dianne Hackborn
4b60a8d1b8 Merge "Added check of ActivityInfo launch mode when starting activity." 2012-08-30 15:19:03 -07:00
Dianne Hackborn
7cd1bfa801 am f59dfc81: am 73365695: Merge "Improve multi-user broadcasts." into jb-mr1-dev
* commit 'f59dfc81f4d1e91aa436ed70d7f8372bce3d91e0':
  Improve multi-user broadcasts.
2012-08-30 15:01:28 -07:00
John Reck
fd26a08751 am 992ab48b: (-s ours) am d02239d1: am 30b5bea0: (-s ours) am 6fdd4963: Merge "DO NOT MERGE Remove dead code" into jb-dev
* commit '992ab48b6e1d206e091fe27100328178cd420535':
  DO NOT MERGE Remove dead code
2012-08-30 15:01:24 -07:00
Teng-Hui Zhu
19762cf319 am e8102ec7: am 4dc187b4: Merge "Fix a typo in the sample code" into jb-mr1-dev
* commit 'e8102ec7df921dd718a6c1803d59c27feb03ef9d':
  Fix a typo in the sample code
2012-08-30 14:58:41 -07:00
Dianne Hackborn
f59dfc81f4 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
John Reck
992ab48b6e am d02239d1: am 30b5bea0: (-s ours) am 6fdd4963: Merge "DO NOT MERGE Remove dead code" into jb-dev
* commit 'd02239d1c05054e4a1e06009410a933a45c24d3e':
  DO NOT MERGE Remove dead code
2012-08-30 14:58:20 -07:00
Maxim Siniavine
03e6e5f4ba am e643ce67: am 92c0e375: Merge "Fixed MemoryUsage issue with reporting results." into jb-mr1-dev
* commit 'e643ce67c95d7c73073882fd30a21e57ed4f98b7':
  Fixed MemoryUsage issue with reporting results.
2012-08-30 14:57:06 -07:00
Teng-Hui Zhu
e8102ec7df am 4dc187b4: Merge "Fix a typo in the sample code" into jb-mr1-dev
* commit '4dc187b43a77be3785c76f42c2fed598f4cee5da':
  Fix a typo in the sample code
2012-08-30 14:56:37 -07:00
Dianne Hackborn
73365695e4 Merge "Improve multi-user broadcasts." into jb-mr1-dev 2012-08-30 14:56:11 -07:00
John Reck
d02239d1c0 am 30b5bea0: (-s ours) am 6fdd4963: Merge "DO NOT MERGE Remove dead code" into jb-dev
* commit '30b5bea07b7357b5063a12e54f002adae9af2b39':
  DO NOT MERGE Remove dead code
2012-08-30 14:55:55 -07:00
Maxim Siniavine
e643ce67c9 am 92c0e375: Merge "Fixed MemoryUsage issue with reporting results." into jb-mr1-dev
* commit '92c0e3757dd7800c9537483f9e7bc0165bc8bdd0':
  Fixed MemoryUsage issue with reporting results.
2012-08-30 14:54:55 -07:00
Teng-Hui Zhu
4dc187b43a Merge "Fix a typo in the sample code" into jb-mr1-dev 2012-08-30 14:54:24 -07:00
John Reck
30b5bea07b am 6fdd4963: Merge "DO NOT MERGE Remove dead code" into jb-dev
* commit '6fdd49630834b1c20a781c9d29b241a68d1289ef':
  DO NOT MERGE Remove dead code
2012-08-30 14:53:42 -07:00
Maxim Siniavine
92c0e3757d Merge "Fixed MemoryUsage issue with reporting results." into jb-mr1-dev 2012-08-30 14:52:23 -07:00
John Reck
6fdd496308 Merge "DO NOT MERGE Remove dead code" into jb-dev 2012-08-30 14:50:17 -07:00
Adam Powell
a9186148ed am b1c8c671: (-s ours) am 6c16d030: am 3dda2cff: (-s ours) am ecb388ef: Merge "DO NOT MERGE - Use focal point for scrolling in GestureDetector" into jb-dev
* commit 'b1c8c67193443cd496887a8724f7c3648057c0ec':
  DO NOT MERGE - Use focal point for scrolling in GestureDetector
2012-08-30 14:38:06 -07:00
Teng-Hui Zhu
a242deb1de Fix a typo in the sample code
Change-Id: I27ee1b0ef8abf5decefae1ec1706a9f142016344
2012-08-30 14:36:58 -07:00
Adam Powell
e9bc50c25b am 08367f9e: (-s ours) am 029d4eb5: am 00925a3b: (-s ours) am d33b6217: DO NOT MERGE - New implementation for ScaleGestureDetector
* commit '08367f9e3612d1504e01884da8b6f24a4458bca8':
  DO NOT MERGE - New implementation for ScaleGestureDetector
2012-08-30 14:36:26 -07:00
Adam Powell
b1c8c67193 am 6c16d030: am 3dda2cff: (-s ours) am ecb388ef: Merge "DO NOT MERGE - Use focal point for scrolling in GestureDetector" into jb-dev
* commit '6c16d030cdcb6a39926a1af50cc4c68d3a4e0660':
  DO NOT MERGE - Use focal point for scrolling in GestureDetector
2012-08-30 14:35:49 -07:00
Adam Powell
08367f9e36 am 029d4eb5: am 00925a3b: (-s ours) am d33b6217: DO NOT MERGE - New implementation for ScaleGestureDetector
* commit '029d4eb5b217101f1dfd1d7bff5f09c6bc7660d0':
  DO NOT MERGE - New implementation for ScaleGestureDetector
2012-08-30 14:34:03 -07:00
Dianne Hackborn
5ac72a2959 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
Adam Powell
6c16d030cd am 3dda2cff: (-s ours) am ecb388ef: Merge "DO NOT MERGE - Use focal point for scrolling in GestureDetector" into jb-dev
* commit '3dda2cffafd94f7f9885efae1c9dc06bc3a625f0':
  DO NOT MERGE - Use focal point for scrolling in GestureDetector
2012-08-30 14:33:14 -07:00
Adam Powell
029d4eb5b2 am 00925a3b: (-s ours) am d33b6217: DO NOT MERGE - New implementation for ScaleGestureDetector
* commit '00925a3b883080fa6888ae9905394fc786465d26':
  DO NOT MERGE - New implementation for ScaleGestureDetector
2012-08-30 14:31:33 -07:00
Adam Powell
3dda2cffaf am ecb388ef: Merge "DO NOT MERGE - Use focal point for scrolling in GestureDetector" into jb-dev
* commit 'ecb388efefc427c3fa93f07fd11502564dc194a5':
  DO NOT MERGE - Use focal point for scrolling in GestureDetector
2012-08-30 14:30:49 -07:00
Adam Powell
00925a3b88 am d33b6217: DO NOT MERGE - New implementation for ScaleGestureDetector
* commit 'd33b6217fc128652a72f1626bcaa5f3b754102c6':
  DO NOT MERGE - New implementation for ScaleGestureDetector
2012-08-30 14:29:02 -07:00
Adam Powell
ecb388efef Merge "DO NOT MERGE - Use focal point for scrolling in GestureDetector" into jb-dev 2012-08-30 14:28:17 -07:00
Daniel Sandler
f72705725b am 7c1aa7f9: am 0dd248ea: Merge "Turn off deadzone flash, replacing it with logcat." into jb-mr1-dev
* commit '7c1aa7f99d0db69b88c75954dc14eff99704f844':
  Turn off deadzone flash, replacing it with logcat.
2012-08-30 14:18:07 -07:00
Daniel Sandler
7c1aa7f99d am 0dd248ea: Merge "Turn off deadzone flash, replacing it with logcat." into jb-mr1-dev
* commit '0dd248ea61e1b8d56b342266cc9ef045f5742048':
  Turn off deadzone flash, replacing it with logcat.
2012-08-30 14:15:47 -07:00
Daniel Sandler
0dd248ea61 Merge "Turn off deadzone flash, replacing it with logcat." into jb-mr1-dev 2012-08-30 14:12:22 -07:00
Daniel Sandler
25bb8eec2d Turn off deadzone flash, replacing it with logcat.
Change-Id: I30db97e5c3a6ef3a06e6065ccf087a7f6d1f9286
2012-08-30 17:10:50 -04:00
Maxim Siniavine
2effa64ab7 Fixed MemoryUsage issue with reporting results.
When the memory of the application did not stabilize within
the time limit, the test would report that using the application
name, instead of the result key. Fixed the test to always use the
result key.

Change-Id: Ie16969e831bd3d89ee0496b992568f52bf1989cb
2012-08-30 14:05:38 -07:00
Jean-Baptiste Queru
51fa9a80ec am 6cd3c3e6: am 4698e36d: am 6ab3ea5f: am 147ef944: am 60d1e1a0: Merge "Watchdog: Improvement of debuggability"
* commit '6cd3c3e6a7e0f50204e56fadc9cce6501b979be0':
  Watchdog: Improvement of debuggability
2012-08-30 13:59:57 -07:00
Jean-Baptiste Queru
6cd3c3e6a7 am 4698e36d: am 6ab3ea5f: am 147ef944: am 60d1e1a0: Merge "Watchdog: Improvement of debuggability"
* commit '4698e36db68273b556867522b1aaffabb8099518':
  Watchdog: Improvement of debuggability
2012-08-30 13:57:23 -07:00
Jean-Baptiste Queru
4698e36db6 am 6ab3ea5f: am 147ef944: am 60d1e1a0: Merge "Watchdog: Improvement of debuggability"
* commit '6ab3ea5f48abfd777d5bd18d92acc3bc766f78ce':
  Watchdog: Improvement of debuggability
2012-08-30 13:54:18 -07:00
Jean-Baptiste Queru
6ab3ea5f48 am 147ef944: am 60d1e1a0: Merge "Watchdog: Improvement of debuggability"
* commit '147ef9448540adaa4312e3cbc01adfc3c7902f50':
  Watchdog: Improvement of debuggability
2012-08-30 13:52:00 -07:00
Jean-Baptiste Queru
147ef94485 am 60d1e1a0: Merge "Watchdog: Improvement of debuggability"
* commit '60d1e1a09e4603e24652e930597ab204855eaa77':
  Watchdog: Improvement of debuggability
2012-08-30 13:49:58 -07:00
Craig Mautner
0da639b54b am 6eaad04a: am 8b300ed1: Merge "Don\'t die(immediate) if from performTraversals." into jb-mr1-dev
* commit '6eaad04a546c52dd3b6a30237304428d760255b0':
  Don't die(immediate) if from performTraversals.
2012-08-30 13:38:02 -07:00
Craig Mautner
6eaad04a54 am 8b300ed1: Merge "Don\'t die(immediate) if from performTraversals." into jb-mr1-dev
* commit '8b300ed14f74a28ac7752d33b39bc7ac91bd9b26':
  Don't die(immediate) if from performTraversals.
2012-08-30 13:35:20 -07:00
Eric Laurent
3883f2f00c am 35ebf28a: am 0c9278d3: Merge "AudioService: pause music when undocked" into jb-mr1-dev
* commit '35ebf28a95af44d136f4033a0dcdc24451c2ce64':
  AudioService: pause music when undocked
2012-08-30 13:33:55 -07:00
Adam Powell
d91ad58ad7 am 9d3c6772: am 7a8b68c4: Merge "Use focal point for scrolling in GestureDetector" into jb-mr1-dev
* commit '9d3c677294c360f069bc98dfb6628e8e9deea715':
  Use focal point for scrolling in GestureDetector
2012-08-30 13:33:52 -07:00
Craig Mautner
8b300ed14f Merge "Don't die(immediate) if from performTraversals." into jb-mr1-dev 2012-08-30 13:33:20 -07:00
Jean-Baptiste Queru
60d1e1a09e Merge "Watchdog: Improvement of debuggability" 2012-08-30 13:32:10 -07:00