Amith Yamasani
8b19c9b877
Fix API version number for new symbols.
...
Change-Id: I9f99f99b6c2d3eec54ea784e3e79e86347c6a522
2013-03-21 16:53:10 -07:00
Kenny Root
5c95bf300c
am e37478c4: am 9d262c49: am f6c4dba2: Merge "KeyStore: change migrate to duplicate"
...
* commit 'e37478c4ebbe6e95ef3904b9f2fa0e93e1b258ac':
KeyStore: change migrate to duplicate
2013-03-21 23:12:29 +00:00
Fabrice Di Meglio
605c5af9c8
Fix bug #8200928 ExpandableListView should be RTL-aware
...
- draw the group and child indicator at the correct position when in RTL mode
Change-Id: Ib346ae59f17c129fc59b76cd7fcc36fbdb86e499
2013-03-21 16:10:13 -07:00
Chris Craik
7289e341b1
Isolate tiling clip state from snapshot
...
bug:8409891
Snapshots frequently have their clip overwritten due to applying
deferred state - now, store tiling clip information in a separate
rect, outside of the snapshot so it isn't overwritten.
Change-Id: I21ca4c45dcd802eae99e8de86f11525196777ccb
2013-03-21 16:10:07 -07:00
Dianne Hackborn
aa5214fe9b
Fix issue #8436951 JB-MR2: Compatibility: Audible, Pandora, ...
...
...Tune-In does not work since JWQ77
Instead of crashing the app for it being bad, just go ahead and
show a notification for it anyway that we make up.
You get what you deserve. :p
Change-Id: I92e32b9ff8835dabde63f8e08e991f72de0d0a92
2013-03-21 16:09:56 -07:00
Kenny Root
e37478c4eb
am 9d262c49: am f6c4dba2: Merge "KeyStore: change migrate to duplicate"
...
* commit '9d262c49d96de4d896594bfcf00ece873f1abb7f':
KeyStore: change migrate to duplicate
2013-03-21 16:07:11 -07:00
Eric Laurent
69c782f9e1
am 116e56cd: Merge "Modify headphone volume warning message" into jb-mr2-dev
...
* commit '116e56cdf4bf408bfa3e7f70efc325a2a9f4010b':
Modify headphone volume warning message
2013-03-21 23:05:34 +00:00
Kenny Root
9d262c49d9
am f6c4dba2: Merge "KeyStore: change migrate to duplicate"
...
* commit 'f6c4dba2d30ddba41ccfd6d9d2be2729ea496902':
KeyStore: change migrate to duplicate
2013-03-21 16:05:06 -07:00
Eric Laurent
116e56cdf4
Merge "Modify headphone volume warning message" into jb-mr2-dev
2013-03-21 23:00:14 +00:00
Eric Laurent
6b537c67a6
Modify headphone volume warning message
...
Bug 8434489
Change-Id: Icfbda6a74150ffec68313ef5bc87ed7d3432dd74
2013-03-21 15:52:21 -07:00
Chris Craik
d570ca161e
am 741f6bb8: Merge "Isolate tiling clip state from snapshot" into jb-mr2-dev
...
* commit '741f6bb81063cd12c9cd5e0a6822a41561ef93b2':
Isolate tiling clip state from snapshot
2013-03-21 22:10:49 +00:00
Chris Craik
741f6bb810
Merge "Isolate tiling clip state from snapshot" into jb-mr2-dev
2013-03-21 22:08:13 +00:00
Daniel Sandler
1a47d5627e
am dc0299fb: Merge "Allow whitelisted non-system packages to listen for notifications." into jb-mr2-dev
...
* commit 'dc0299fb2373faddd547d433ffa049fb40d64fac':
Allow whitelisted non-system packages to listen for notifications.
2013-03-21 22:05:07 +00:00
Daniel Sandler
dc0299fb23
Merge "Allow whitelisted non-system packages to listen for notifications." into jb-mr2-dev
2013-03-21 22:01:59 +00:00
Dianne Hackborn
2cbf5fe4b8
am c3ab03a9: Merge "Fix issue #8436951 JB-MR2: Compatibility: Audible, Pandora, ..." into jb-mr2-dev
...
* commit 'c3ab03a9f2c0bc2c4ce8ade6957bcfc30fe2f9ee':
Fix issue #8436951 JB-MR2: Compatibility: Audible, Pandora, ...
2013-03-21 22:01:31 +00:00
Kenny Root
f6c4dba2d3
Merge "KeyStore: change migrate to duplicate"
2013-03-21 21:56:54 +00:00
Dianne Hackborn
c3ab03a9f2
Merge "Fix issue #8436951 JB-MR2: Compatibility: Audible, Pandora, ..." into jb-mr2-dev
2013-03-21 21:55:53 +00:00
Wink Saville
f69239083e
am ad5b0eb7: Merge "Notify user when wi-fi is toggled about scans" into jb-mr2-dev
...
* commit 'ad5b0eb7a7571389b0ec1f5195a60e16797920f5':
Notify user when wi-fi is toggled about scans
2013-03-21 21:51:14 +00:00
Wink Saville
ad5b0eb7a7
Merge "Notify user when wi-fi is toggled about scans" into jb-mr2-dev
2013-03-21 21:46:03 +00:00
Chris Craik
5f80362355
Isolate tiling clip state from snapshot
...
bug:8409891
Snapshots frequently have their clip overwritten due to applying
deferred state - now, store tiling clip information in a separate
rect, outside of the snapshot so it isn't overwritten.
Change-Id: I21ca4c45dcd802eae99e8de86f11525196777ccb
2013-03-21 14:39:04 -07:00
Kenny Root
5f1d965f7d
KeyStore: change migrate to duplicate
...
After discussion, it was determined that duplicate would be less
disruptive and it still fit in the current HAL model.
Change-Id: I2f9cae48d38ec7146511e876450fa39fc92cda55
2013-03-21 14:24:19 -07:00
Dianne Hackborn
2ced96c544
Fix issue #8436951 JB-MR2: Compatibility: Audible, Pandora, ...
...
...Tune-In does not work since JWQ77
Instead of crashing the app for it being bad, just go ahead and
show a notification for it anyway that we make up.
You get what you deserve. :p
Change-Id: I92e32b9ff8835dabde63f8e08e991f72de0d0a92
2013-03-21 14:23:46 -07:00
Justin Ho
1ad11b9c6c
Revert "Revert "Fix ListView is not scrolled properly with arrows""
...
This reverts commit 3cf7b3c592dd6097697ed9e00c1ff59319b49c4e.
2013-03-21 14:21:30 -07:00
Romain Guy
e0ada6319a
am d41f40a4: Merge "Stop worker threads on memory trim & fix bad pointer access" into jb-mr2-dev
...
* commit 'd41f40a48b4786ce5a6585bd1845832db075678e':
Stop worker threads on memory trim & fix bad pointer access
2013-03-21 20:59:33 +00:00
Romain Guy
d41f40a48b
Merge "Stop worker threads on memory trim & fix bad pointer access" into jb-mr2-dev
2013-03-21 20:55:13 +00:00
Irfan Sheriff
7b7beb7952
Notify user when wi-fi is toggled about scans
...
We let the user know when he turns off Wi-Fi that scans will continue to
be available.
User has the option to turn off the dialog and not receive this in the future.
Bug: 8141918
Change-Id: I115ce2ac57125b8ffbb34245dc25effd4b3bebb0
2013-03-21 12:27:20 -07:00
Dianne Hackborn
b2bf4ecd4a
am 71b00177: Merge "Fix issue #8410116 : "Disable your screen lock" permission..." into jb-mr2-dev
...
* commit '71b0017759b825f8bddcdda7425afc802e8918c9':
Fix issue #8410116 : "Disable your screen lock" permission...
2013-03-21 17:18:02 +00:00
Dianne Hackborn
71b0017759
Merge "Fix issue #8410116 : "Disable your screen lock" permission..." into jb-mr2-dev
2013-03-21 17:13:50 +00:00
Michael Jurka
953a946621
am 6812efd2: Merge "Make hasOverlappingRendering() method more accurate" into jb-mr2-dev
...
* commit '6812efd24ee38b7623a5ed85f8f342253a7bc036':
Make hasOverlappingRendering() method more accurate
2013-03-21 17:08:01 +00:00
Michael Jurka
6812efd24e
Merge "Make hasOverlappingRendering() method more accurate" into jb-mr2-dev
2013-03-21 17:04:54 +00:00
Svetoslav Ganov
a7affb49ec
am bce0fa81: Merge "Don\'t recycle accessibility event after sending." into jb-mr2-dev
...
* commit 'bce0fa813347285954bbc15138930050775b690e':
Don't recycle accessibility event after sending.
2013-03-21 16:53:49 +00:00
Svetoslav Ganov
bce0fa8133
Merge "Don't recycle accessibility event after sending." into jb-mr2-dev
2013-03-21 16:49:10 +00:00
Michael Jurka
0931a8516a
Make hasOverlappingRendering() method more accurate
...
Bug: 8439502
Change-Id: I80075eddf6abc7999b70e665e692d88b81d5f087
2013-03-21 16:12:35 +01:00
Wink Saville
75c1e69bd5
Add some new constants.
...
Add EVENT_DISCONNECT_DC_RETRYING, EVENT_SETUP_DATA_COMPLETE_ERROR
and State.RETRYING to DctContants.
Add MDC_INITIAL_MAX_RETRY to Settings.Global.
Bug: 4772191
Change-Id: Id54a20ab192783c63939158670faaf531a527640
2013-03-21 07:20:05 -07:00
The Android Automerger
af771ea3eb
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-21 05:55:34 -07:00
John Spurlock
2d9305ccc2
am 62a4858b: Merge "Hide carrier string when emergency call button pressed." into jb-mr2-dev
...
* commit '62a4858b7915d6d190bb0cdb806a733b02049f5a':
Hide carrier string when emergency call button pressed.
2013-03-21 10:54:54 +00:00
John Spurlock
62a4858b79
Merge "Hide carrier string when emergency call button pressed." into jb-mr2-dev
2013-03-21 10:52:25 +00:00
Daniel Sandler
4b749ef5f2
Allow whitelisted non-system packages to listen for notifications.
...
The allowed packages are listed in
Settings.Secure.ENABLED_NOTIFICATION_LISTENERS. (Don't let
the plural fool you: only one listener will be supported in
the UI.)
Change-Id: Ia69f2ba05d8e555fd4d40b0cc89c62ed14af3cac
2013-03-21 01:41:20 -07:00
Amith Yamasani
1641f86bb0
am 1eab5f26: Fix javadoc breakage
...
* commit '1eab5f26939748dea5e94bf019804a68d2a2b161':
Fix javadoc breakage
2013-03-21 07:03:23 +00:00
Amith Yamasani
1eab5f2693
Fix javadoc breakage
...
Change-Id: I72df82a8855322145c870bd8db64da81533be4cc
2013-03-20 23:54:07 -07:00
Amith Yamasani
99755cd303
am d4f88008: Merge "Application restrictions API" into jb-mr2-dev
...
* commit 'd4f8800801cf5c9ca44c2b6977d8db2e0bac5809':
Application restrictions API
2013-03-21 06:15:34 +00:00
Amith Yamasani
d4f8800801
Merge "Application restrictions API" into jb-mr2-dev
2013-03-21 06:12:38 +00:00
Wink Saville
96e177c7dd
am 4deaf893: am 6837f4a4: am e4679750: Merge "Fix Watchdog HeartbeatHandler to run on correct thread"
...
* commit '4deaf8934b734dae21253c57c0017cab45736375':
Fix Watchdog HeartbeatHandler to run on correct thread
2013-03-21 05:43:39 +00:00
Wink Saville
4deaf8934b
am 6837f4a4: am e4679750: Merge "Fix Watchdog HeartbeatHandler to run on correct thread"
...
* commit '6837f4a44235f96d410190806448ddf43d2fe696':
Fix Watchdog HeartbeatHandler to run on correct thread
2013-03-20 22:42:19 -07:00
Wink Saville
6837f4a442
am e4679750: Merge "Fix Watchdog HeartbeatHandler to run on correct thread"
...
* commit 'e4679750c538e982bb81f4eea2343e8bede3e118':
Fix Watchdog HeartbeatHandler to run on correct thread
2013-03-20 22:40:17 -07:00
Amith Yamasani
df2e92a535
Application restrictions API
...
Adds the ability for apps to export some restrictions. The restrictions
are presented in Settings based on the restriction type. The user's
selections are stored by UserManagerService and provided to the
target user's application as a list of RestrictionEntry objects which
contain the key, value(s).
Also introduce a manifest entry for system apps to request that the
app be automatically installed in all users, so that they cannot be
deselected by the owner user.
Shared account filtering for non-whitelisted apps.
Change-Id: I15b741e3c0f3448883cb364c130783f1f6ea7ce6
2013-03-20 22:29:59 -07:00
Wink Saville
e4679750c5
Merge "Fix Watchdog HeartbeatHandler to run on correct thread"
2013-03-21 04:49:28 +00:00
Romain Guy
c5cbee7d78
Stop worker threads on memory trim & fix bad pointer access
...
Change-Id: I6fe7e31aeb6dd41fa65ab952caed97bc2da510d7
2013-03-20 19:16:53 -07:00
Romain Guy
94b43d6316
am 9eac5269: Merge "Optimize text GL setup" into jb-mr2-dev
...
* commit '9eac52698b18d089e73c7ec2bf73a64a39504733':
Optimize text GL setup
2013-03-21 01:58:52 +00:00
Romain Guy
9eac52698b
Merge "Optimize text GL setup" into jb-mr2-dev
2013-03-21 01:54:42 +00:00