drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
157,066 Commits 1 Branch 0 Tags
Commit Graph

157066 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
e586ab7967 Merge "Reset rotation-lock-for-accessibility setting on upgrade." into lmp-mr1-dev 2014-11-07 20:26:35 +00:00
John Spurlock
8c51d0b711 Reset rotation-lock-for-accessibility setting on upgrade. 
Since it now hides the display setting, force the user to opt-in
again.

Bug: 18104538
Change-Id: I4cac947f7a35ba0f578d059542401dcc5d169307
 2014-11-07 15:14:21 -05:00
Jason Monk
e0cdb6079e Prepare for testing the NetworkControllerImpl 
This will allow us to add some test cases to verify that under
certain phone/signal conditions we get out the icons we expect.
This will let us break less things when refactoring for MSIM.

Bug: 18222975
Change-Id: I7bd3e66e7de6b30fede72e40fb6aa37dd523336c
 2014-11-07 20:08:47 +00:00
Sanket Padawe
d227b4aa91 Merge "API changes to add carrier name to subinforecord" into lmp-mr1-dev 2014-11-07 19:47:49 +00:00
Dan Stoza
d17793ea2a Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev 2014-11-07 19:44:34 +00:00
Sanket Padawe
e1013f964d API changes to add carrier name to subinforecord 
API changes required to add carrier name of sim as a member of subinforecord.

Change-Id: I08a7f53dc012967005f7b5abd1fbc08f2947da67
 2014-11-07 11:37:29 -08:00
Jason Monk
f9cf698fe0 Merge "Fix Build" into lmp-mr1-dev 2014-11-07 19:32:47 +00:00
John Reck
ea4e76f68a Merge "Fix finalizer ordering/double-free issue" into lmp-mr1-dev 2014-11-07 19:29:47 +00:00
Jason Monk
823c7bc5c5 Fix Build 
Change-Id: I0f4094718435b219b6e6b1d98435377a42319adb
 2014-11-07 14:25:17 -05:00
John Reck
aa95a88327 Have an actual fallback if the surface is lost 
Bug: 17516789

This will force a relayout/reinitialize pass if the Surface
is lost mid-render instead of crashing on the next frame

Change-Id: If08bfa16f740728fa7c05904fa11e26f07b81e2e
 2014-11-07 11:02:07 -08:00
Jason Monk
975590f229 Merge "Material design for screen pinning cling" into lmp-mr1-dev 2014-11-07 18:59:25 +00:00
Jason Monk
2f04d16f16 Merge "Plumbing for screen pinning request from sysui" into lmp-mr1-dev 2014-11-07 18:53:54 +00:00
Ricardo Cervera
68dcc56aec am 10a08abd: am 578e205d: am e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200" into klp-modular-docs automerge: 58dc8c4 automerge: c9ad13a 
* commit '10a08abd8f9249f66f73070955c2f3f09d45598b':
 2014-11-07 18:46:44 +00:00
Tom Taylor
563a438363 am ad697e58: am d1290de2: am 7c570346: am 47419a44: am 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushMana 
* commit 'ad697e5820ba624935929bcc9f33b9c38dd28f76':
 2014-11-07 18:41:30 +00:00
Tom Taylor
d6b14cbeda am cc9c81a9: am 1764db5b: am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager automerge: db864e4 automerge: 89f7eca 
* commit 'cc9c81a90aab5bc5849272fa8a4d2f64366e7c19':
 2014-11-07 18:41:26 +00:00
Christopher Tate
bbe23b31dc Enable runtime turndown of backup/restore services 
The heavy implementation of the backup manager service is now sitting
behind a lightweight trampoline that actually provides the binder
call interface.  The indirection allows us now to tear down the
implementation on the fly without breaking callers who have cached
binder references to the backup services: these callers will simply
see their future invocations failing benignly.

In addition there is now an API for suitably privileged callers such
as device policy management to effect this turndown.

Finally, there is now a static system property, "ro.backup.disable",
that a product can use to outright remove backup/restore operation
from the system's operation.  The public APIs will continue to be
safely usable on such products but no data will be moved to or
from the device.

Bug 17367491

Change-Id: I8108e386ef3b5c967938fae483366d6978fe4e04
 2014-11-07 18:40:47 +00:00
Ricardo Cervera
10a08abd8f am 578e205d: am e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200" into klp-modular-docs automerge: 58dc8c4 automerge: c9ad13a 
* commit '578e205d977d66fce491015f1f31ab82c534587d':
 2014-11-07 18:39:00 +00:00
John Reck
4b19b7aaff Merge "Fix wrong-thread issue" into lmp-mr1-dev 2014-11-07 18:34:55 +00:00
John Reck
c298f9c917 Fix finalizer ordering/double-free issue 
Bug: 18289984

If Surface:finalize() happens after HwuiContext:finalize()
it would try to manipulate a destroyed object. However, as
Surface:finalize() always calls HwuiContext:destroy() this
can be fixed by simply getting rid of HwuiContext's finalizer

Change-Id: I7c912214417ab32891b1c58d045c9721e5f01965
 2014-11-07 10:33:36 -08:00
Tom Taylor
ad697e5820 am d1290de2: am 7c570346: am 47419a44: am 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager automerge 
* commit 'd1290de2aabb0f79be29a9c5135fe1049df016d0':
 2014-11-07 18:33:30 +00:00
Tom Taylor
cc9c81a90a am 1764db5b: am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager automerge: db864e4 automerge: 89f7eca 
* commit '1764db5bf2aad8353f94f28ef4ae6c284adeb547':
 2014-11-07 18:33:27 +00:00
John Reck
12f5e34332 Fix wrong-thread issue 
Bug: 18259560

Change-Id: Ic63a86efba9c86f21defac0695a73db8b09ae284
 2014-11-07 10:31:53 -08:00
Ricardo Cervera
578e205d97 am e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200" into klp-modular-docs automerge: 58dc8c4 
automerge: c9ad13a

* commit 'c9ad13a5e18a6eea512547cba6530cb1eb6a9da8':
 2014-11-07 18:30:57 +00:00
Tom Taylor
d1290de2aa am 7c570346: am 47419a44: am 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager automerge: 6209d4e 
automerge: 739117f

* commit '739117f1a1f70168461a61219b02a90118641e05':
 2014-11-07 18:29:25 +00:00
Tom Taylor
1764db5bf2 am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager automerge: db864e4 
automerge: 89f7eca

* commit '89f7eca148869850fd5d107acbbb33a0a555fcd6':
 2014-11-07 18:27:57 +00:00
destradaa
3546c9a582 Merge "Mark Gps Raw related APIs as System APIs. b/16727892" into lmp-mr1-dev 2014-11-07 18:22:32 +00:00
Ricardo Cervera
c9ad13a5e1 am e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200" into klp-modular-docs 
automerge: 58dc8c4

* commit '58dc8c42f2880b4264bfad46b9ab443576d4b4f2':
  docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
 2014-11-07 17:49:58 +00:00
Winson Chung
14638d76bb am e660d6f1: am 4ad2c5ba: Merge "Increasing the min swipe thresholds for the nav bar gestures. (Bug 17109581)" into lmp-dev 
* commit 'e660d6f179a01ea18867e9e2126eddd941596953':
  Increasing the min swipe thresholds for the nav bar gestures. (Bug 17109581)
 2014-11-07 17:41:01 +00:00
Jeff Davidson
ea09c7da01 Merge "Let scorers fine-tune scoring heuristics." into lmp-mr1-dev 2014-11-07 17:38:38 +00:00
Winson Chung
e660d6f179 am 4ad2c5ba: Merge "Increasing the min swipe thresholds for the nav bar gestures. (Bug 17109581)" into lmp-dev 
* commit '4ad2c5ba9ba39ff6116b657d36f671a4cdd2396f':
  Increasing the min swipe thresholds for the nav bar gestures. (Bug 17109581)
 2014-11-07 17:34:57 +00:00
Winson Chung
4ad2c5ba9b Merge "Increasing the min swipe thresholds for the nav bar gestures. (Bug 17109581)" into lmp-dev 2014-11-07 17:30:58 +00:00
Jason Monk
18f99d9134 Material design for screen pinning cling 
Switching from a dialog to a cling-like view to be more material.
Also moving it into SysUI as it highlights the buttons in nav bar.
This will be triggered directly from recents, but from apps it
will be triggered by the PhoneStatusBar.  In the case that apps
trigger the request, there will be a 'no thanks' button so that
users can refuse.

Bug: 16957435
Change-Id: Ie880f82c66f4b2be98283ed3fa789703c4bd7ed5
 2014-11-07 11:09:19 -05:00
Baligh Uddin
f3a1007af0 am 6aaa61fd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '6aaa61fd55955fd711199035fbd9771dcb8a9656':
  Import translations. DO NOT MERGE
 2014-11-07 15:58:15 +00:00
Baligh Uddin
d8ed806034 am 63717687: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '637176877e9358dc5badd140cd2b795701e7459c':
  Import translations. DO NOT MERGE
 2014-11-07 15:52:32 +00:00
Baligh Uddin
714e163663 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-07 15:50:07 +00:00
Baligh Uddin
6aaa61fd55 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-11-07 15:49:30 +00:00
Baligh Uddin
326b291988 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-07 15:45:43 +00:00
Baligh Uddin
637176877e Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-11-07 15:45:37 +00:00
Baligh Uddin
ddfe33b690 Import translations. DO NOT MERGE 
Change-Id: Iae4fdd5608681f999b8b8234262b6da60d79eea2
Auto-generated-cl: translation import
 2014-11-07 01:50:28 -08:00
Ignacio Solla
803908b0db Merge "[WebView] Remove WEBVIEW_DATA_REDUCTION_PROXY setting." into lmp-mr1-dev 2014-11-07 09:44:59 +00:00
Baligh Uddin
31b3de0d95 Import translations. DO NOT MERGE 
Change-Id: Ic6355a1f0a89aadd602b3cfa6660f735f6d04d7b
Auto-generated-cl: translation import
 2014-11-07 01:44:33 -08:00
Baligh Uddin
e6ac0cd883 Import translations. DO NOT MERGE 
Change-Id: I2cd2b6ae9fb2a5114ee931d03e7d1f5aff0bc1e6
Auto-generated-cl: translation import
 2014-11-06 23:26:52 -08:00
Baligh Uddin
a8b1305363 Import translations. DO NOT MERGE 
Change-Id: Id09faf98f305e5319eecc2d18b25ccde8aed55c1
Auto-generated-cl: translation import
 2014-11-06 23:11:55 -08:00
Tyler Gunn
ab4650c456 Conference event package performance improvement. 
- Instead of sending each participant to the telephony conference
controller, all participants are sent at once.  This way the conference
only needs to be recalculated once.

Bug: 18057361
Change-Id: I86205fc7f1d2648bb180fc7eaf3ad611955952f9
 2014-11-06 20:06:23 -08:00
Quddus Chong
fedaef0d92 am 15127a69: am 871aff9c: Merge "docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075" into lmp-docs automerge: 0d7fa2f 
* commit '15127a69f6885f6fda2f60f9f2eafa2752d0f3e6':
  docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075
 2014-11-07 03:53:14 +00:00
Quddus Chong
15127a69f6 am 871aff9c: Merge "docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075" into lmp-docs 
automerge: 0d7fa2f

* commit '0d7fa2fdd95a1e76373bfa8be31d8c50e96c5715':
  docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075
 2014-11-07 03:45:33 +00:00
Jeff Brown
5ce1cb240b Move device admin max screen off timeout to internal interface. 
The setting was previously exposed in IPowerManager but it
doesn't need to be there.

Bug: 17656076
Change-Id: If3ed0cbe89f67c60aa00376be0c54b1bd9656144
 2014-11-06 19:34:21 -08:00
Quddus Chong
0d7fa2fdd9 am 871aff9c: Merge "docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075" into lmp-docs 
* commit '871aff9ca6654ee17e1cfb6d76b987dd3d552bba':
  docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075
 2014-11-07 02:52:28 +00:00
Jim Miller
c6f5009fdb Merge "Fix build" into lmp-mr1-dev 2014-11-07 02:18:20 +00:00
Jungshik Jang
7fb8e7f4ff CEC: Send <Give System Audio Mode> regardless of TV's setting. 
When TV is brought back out of standby, it should send <Give System Audio Mode>
to audio receiver so that TV recovers system audio mode.
Current implementation sends <Give System Audio Mode> only when setting is "ON".
In order to fix this, this change sends <Give System Audio Mode>
regardless of TV's setting and update system audio mode according to
response of <Give System Audio Mode>.

Bug: 18267467
Change-Id: I2c3c05347c6f2a7a3a5e3772e4e26c77156eb740
 2014-11-07 11:11:58 +09:00