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

19781 Commits

Author SHA1 Message Date
Winson Chung
1e1d243901 am 41e1107e: am d0f79c5c: Merge "Fixing issue with inconsistent icon filename. (Bug 16992882)" into lmp-dev 
* commit '41e1107e115a9b7a27b9494fe7d4bef2e99d1686':
  Fixing issue with inconsistent icon filename. (Bug 16992882)
 2014-08-21 17:37:26 +00:00
Paul Jensen
b4fa36e153 am 49e50b0a: am 4a5d418d: Merge "Send captive portal broadcast as user CURRENT." into lmp-dev 
* commit '49e50b0a1200a281f954c33b288f51ee577d2852':
  Send captive portal broadcast as user CURRENT.
 2014-08-21 17:27:27 +00:00
Winson Chung
b91bd653c9 Merge "Fixing issue with inconsistent icon filename. (Bug 16992882)" into lmp-dev 2014-08-21 17:19:28 +00:00
Dianne Hackborn
865bac56f5 am a7d4d7bc: am ee6e179e: Merge "Fix issue #17038762: Add API to add entries to the recents list" into lmp-dev 
* commit 'a7d4d7bcfa51aa6d556652141a34c497bb4132d0':
  Fix issue #17038762: Add API to add entries to the recents list
 2014-08-21 17:17:24 +00:00
Paul Jensen
e16a24559f Merge "Send captive portal broadcast as user CURRENT." into lmp-dev 2014-08-21 17:05:42 +00:00
Dianne Hackborn
198d928615 Merge "Fix issue #17038762: Add API to add entries to the recents list" into lmp-dev 2014-08-21 16:56:18 +00:00
Lorenzo Colitti
385e80a62c am 061ad3f4: am ff067823: Merge "Fix findConnectionTypeForIface." into lmp-dev 
* commit '061ad3f4656d747d959666c2290e7ba8d510d7af':
  Fix findConnectionTypeForIface.
 2014-08-21 16:20:38 +00:00
Lorenzo Colitti
a945c35273 Merge "Fix findConnectionTypeForIface." into lmp-dev 2014-08-21 16:08:11 +00:00
Naveen Kalla
208fc81aa0 am 7fe44c06: am 30e6a232: Invoke shutdownMobileRadios Telephony APIs from ShutdownThread 
* commit '7fe44c068c05de1f1e721b4c268b0fedb7616d9e':
  Invoke shutdownMobileRadios Telephony APIs from ShutdownThread
 2014-08-21 15:23:36 +00:00
Esteban Talavera
d449f101d1 am 87d536ab: am 5f9653ce: Merge "Rename get/setBlockUninstall() to get/setUninstallBlocked()" into lmp-dev 
* commit '87d536ab13bda0ebd1a8f7d28f8b11c895debff4':
  Rename get/setBlockUninstall() to get/setUninstallBlocked()
 2014-08-21 15:15:10 +00:00
Naveen Kalla
bd7723637b Invoke shutdownMobileRadios Telephony APIs from ShutdownThread 
shutdownMobileRadios API shuts down multiple Radios on MSIM devices and
also gracefully shuts down Radios and SIM cards on single SIM and
MSIM devices. Use this API instead of the old setRadio APIs.

Add RIL_REQUEST_SHUTDOWN to RILConstants. Message is sent to notify
RIL that the device is shutting down.

Bug: 9773278
Change-Id: I6afa9e810cefc7855f7ae42e51f39cc51fa2aa6e
 2014-08-21 15:08:22 +00:00
Esteban Talavera
8cce064f1b am 50a84946: am 58dada0d: Merge "Remove setApplicationsHidden" into lmp-dev 
* commit '50a84946336e747378ea8f09ff1bf3d6fb457ebe':
  Remove setApplicationsHidden
 2014-08-21 14:34:13 +00:00
Esteban Talavera
d5c5c13c85 Rename get/setBlockUninstall() to get/setUninstallBlocked() 
As requested in the API review

Bug: 17005622
Change-Id: I1332ad11e588ab3fa409f2a28222608936cb383e
 2014-08-21 15:30:13 +01:00
Jason Monk
ce6e75bb43 am ee986895: am e34fef3b: Don\'t stack toasts for every user press 
* commit 'ee9868955b11f44c37970fa9309928d11d199ec2':
  Don't stack toasts for every user press
 2014-08-21 14:24:48 +00:00
Esteban Talavera
8c5c373647 Merge "Remove setApplicationsHidden" into lmp-dev 2014-08-21 14:17:25 +00:00
Jason Monk
07f82b7942 Don't stack toasts for every user press 
Showing a toast on every press was adding up to a long list of
toasts to clear out of the display, now cancel the last so we
don't have that problem.

Also fix unlock strings to not use insertions because of problems
translating the context.

Bug: 16892731
Bug: 16366701
Change-Id: Ia523469089c9f8dd1f3e466a9d4ea901a376d1bc
 2014-08-21 09:42:42 -04:00
Paul Jensen
55298581a0 Send captive portal broadcast as user CURRENT. 
Previously this was sent without a qualifying user.

bug:17138439
Change-Id: I6345f2375fee168f86c0611e76f869e7377befbe
 2014-08-21 13:02:31 +00:00
Kenny Guy
8bcbf01533 am 48e5eb54: am 977c20b6: Merge "Add apis for whitelisting IMEs and accessibility services." into lmp-dev 
* commit '48e5eb54e27c363f63c0b41597d2a7f0cb2d0da2':
  Add apis for whitelisting IMEs and accessibility services.
 2014-08-21 11:11:51 +00:00
Kenny Guy
b9e468cb9d Merge "Add apis for whitelisting IMEs and accessibility services." into lmp-dev 2014-08-21 10:54:26 +00:00
Esteban Talavera
115cd65d2a Remove setApplicationsHidden 
As requested in the API review. This version (the one that takes an Intent) was used only in the DeviceAdminSample and some CTS tests.

Bug: 17005622
Change-Id: I9984b22836417ad4d025302f61bd91704e9345a4
 2014-08-21 10:29:38 +01:00
Jinsuk Kim
22df1c14c3 am c65e637d: am 2e84b632: Merge "CEC: Fix a bug not sending <Set Stream Path>" into lmp-dev 
* commit 'c65e637d0e7a2dd0e2f3e01e3c9471153d36e52b':
  CEC: Fix a bug not sending <Set Stream Path>
 2014-08-21 06:10:20 +00:00
Jinsuk Kim
f860be88a9 Merge "CEC: Fix a bug not sending <Set Stream Path>" into lmp-dev 2014-08-21 05:53:51 +00:00
Jinsuk Kim
4c80b835cd am 6c68b9fd: am b614b10f: Merge "CEC: Invoke input change for RAP request from MHL device" into lmp-dev 
* commit '6c68b9fdcbadf28f260ec73b0b1e39b2ad901efe':
  CEC: Invoke input change for RAP request from MHL device
 2014-08-21 05:42:26 +00:00
Jinsuk Kim
2626958c4b CEC: Fix a bug not sending <Set Stream Path> 
Passes the right flag to manual routing switching method for TV
to send out <Set Stream Path> to the newly selected device(path).

Bug: 17169555
Change-Id: I4a14925e366a433f36b28170e37d041053c0060d
 2014-08-21 14:31:40 +09:00
Jinsuk Kim
6800cddd6f Merge "CEC: Invoke input change for RAP request from MHL device" into lmp-dev 2014-08-21 05:26:19 +00:00
Jae Seo
8e1b570e3b am 797eeba5: am 9c179483: API Review: android.media.tv 
* commit '797eeba5445672125bf49e92812a910231163b00':
  API Review: android.media.tv
 2014-08-21 04:19:44 +00:00
Jae Seo
14355950d5 API Review: android.media.tv 
TvContentRating:
- The XML file: attributes should have android: prefix and should allow
  string resource references for labels.

Bug: 17114406
Change-Id: Ife2f4dc6c2c8a5a1714cdeedb27aab40fce73e2b
 2014-08-20 20:59:51 -07:00
Jinsuk Kim
e9f6ed3b11 CEC: Invoke input change for RAP request from MHL device 
Transform RAP[ContentOn/Off] to input change event.

Bug: 17141884
Change-Id: Ic2d8e305f482ebb4f4f3b3e167f726a66dc174cf
 2014-08-21 12:54:18 +09:00
Svet Ganov
2afdba5c5b am 51cb9701: am 2b86b50b: Merge "Notify app widget hosts when cross-profile providers change." into lmp-dev 
* commit '51cb97015fd3316a371b0e16649f5c757ffb8ae1':
  Notify app widget hosts when cross-profile providers change.
 2014-08-21 03:10:09 +00:00
Christopher Tate
381b43c3d1 am e7a39e14: am 54eaf4f8: Merge "Maintain transport connection through package updates" into lmp-dev 
* commit 'e7a39e146667ffc0def1fe712476a07c1bfca325':
  Maintain transport connection through package updates
 2014-08-21 03:08:59 +00:00
Robert Greenwalt
3cbbb788f2 am 32880cb0: am 3a494857: Merge "Avoid reusing a currently active NetID." into lmp-dev 
* commit '32880cb05dddacb1a70bd27fe3cf187ac23cf008':
  Avoid reusing a currently active NetID.
 2014-08-21 03:08:05 +00:00
Robert Greenwalt
d104d72e53 am 9be0b06c: am c0674366: Merge "Fix listening NetworkRequests to listen for all networks." into lmp-dev 
* commit '9be0b06c37952a6bcf6e5b21976d6a3317991510':
  Fix listening NetworkRequests to listen for all networks.
 2014-08-21 03:08:00 +00:00
Robert Greenwalt
535aa1ef91 am 5133fa4f: am 7f07196d: Merge "Add missing break statements to avoid unnecessary network validation." into lmp-dev 
* commit '5133fa4f1736aab1d807a6549973489e97fab827':
  Add missing break statements to avoid unnecessary network validation.
 2014-08-21 03:07:55 +00:00
Robert Greenwalt
16cae8d5c9 am 95c1fe99: am dd387b4a: Merge "Fix CS/NetworkMonitor race." into lmp-dev 
* commit '95c1fe99585077c20d1287bc6e4e74a58bdaa63c':
  Fix CS/NetworkMonitor race.
 2014-08-21 03:07:51 +00:00
Lorenzo Colitti
9693de21f4 am 2e9ab3ab: am aebd7b79: Merge "Update state to failed if the VPN fails to connect." into lmp-dev 
* commit '2e9ab3abfd1fe84a3021d549cdd43c45c8bfda73':
  Update state to failed if the VPN fails to connect.
 2014-08-21 03:02:37 +00:00
Jeff Davidson
814c033d38 am d217efb9: am 709941fd: Merge "Less intrusive VPN dialog and other UX tweaks." into lmp-dev 
* commit 'd217efb9da55bbdbb69bd33cb88531cb7c1ce76b':
  Less intrusive VPN dialog and other UX tweaks.
 2014-08-21 03:01:44 +00:00
Diego Pontoriero
2d21ec47ca am 744a16e4: am dede6854: Merge "Change CARRIER_SETUP hook in ConnectivityService to use Aeroshell API for determining carrier app instead of MCC/MNC." into lmp-dev 
* commit '744a16e448533d591205fb24c46ee218e08d4e4e':
  Change CARRIER_SETUP hook in ConnectivityService to use Aeroshell API for determining carrier app instead of MCC/MNC.
 2014-08-21 03:01:39 +00:00
Jason Monk
e1fd447596 am fb0f3ab2: am a765518f: Merge "Lock task doesn\'t always end properly." into lmp-dev 
* commit 'fb0f3ab21eed9a93f6792f0c610d96cb8caaebf6':
  Lock task doesn't always end properly.
 2014-08-21 02:57:42 +00:00
Dianne Hackborn
aec68bb89f Fix issue #17038762: Add API to add entries to the recents list 
New API Added to ActivityManager for adding an entry.  See docs
there.

Repercussions:

- I hit a bug in system UI where if the thumbnail has alpha, it tries
  to modify it, but thumbnails are loading immutable so crashes.  Fixed
  this by loading the bitmaps to be mutable.
- Improved dump output of recents; there was a lot of stuff missing.
  Also split the recents dump output from the rest of the activity
  output, since it can be really large.
- Added tests to the lovely ActivityTest app.

Bonus: new method on AppTask to control the exclude from recents flag.

Change-Id: I01e543db4d15320ee1701e95872fef73c116526c
 2014-08-20 18:03:43 -07:00
Winson Chung
3bad5cc0f5 Fixing issue with inconsistent icon filename. (Bug 16992882) 2014-08-21 00:44:27 +00:00
Svet Ganov
635bc8bc84 Merge "Notify app widget hosts when cross-profile providers change." into lmp-dev 2014-08-21 00:22:45 +00:00
Adrian Roos
9d0a5fd90c am 28ee5f81: am 323d9567: Merge "Allow SystemUI to control Bluetooth for secondary users" into lmp-dev 
* commit '28ee5f81038ef47bc6855e77bd5a9dadd296f45a':
  Allow SystemUI to control Bluetooth for secondary users
 2014-08-21 00:45:14 +00:00
Christopher Tate
2ad553d07b am 9ca86a61: am 08191dff: Merge "Don\'t crash good-citizen restore session clients" into lmp-dev 
* commit '9ca86a61476b2c6f33392400ced14cf43ee589c1':
  Don't crash good-citizen restore session clients
 2014-08-21 00:45:05 +00:00
Jeff Sharkey
28d57a5e6c am 54a521e9: am 08db58c4: Merge "More progress towards split APKs in ASECs." into lmp-dev 
* commit '54a521e9ca79002b8191f33f6d8bf0d61e6d10d2':
  More progress towards split APKs in ASECs.
 2014-08-21 00:45:00 +00:00
Michael Lentine
fd782ebad7 am b3b29eda: am 97c4c03a: Merge "Reduce shutdown animation duration." into lmp-dev 
* commit 'b3b29edad23c27d8787d26d903c9728f5fabca5f':
  Reduce shutdown animation duration.
 2014-08-21 00:44:55 +00:00
Julia Reynolds
9d36917870 am 8da65466: am a6e05830: Merge "Prevent profile owners from setting certain user restrictions." into lmp-dev 
* commit '8da654665ea6c62359e99c9694de81ea1a2fe2ab':
  Prevent profile owners from setting certain user restrictions.
 2014-08-21 00:44:41 +00:00
RoboErik
1874251325 am 8961b5d5: am 7a754ab3: Merge "Api updates to MediaSession components" into lmp-dev 
* commit '8961b5d5ac341ca7ae239569e962f7ff3437f312':
  Api updates to MediaSession components
 2014-08-21 00:44:03 +00:00
Christopher Tate
a555fd847c Merge "Maintain transport connection through package updates" into lmp-dev 2014-08-21 00:22:45 +00:00
Christopher Tate
b2707afb0c Maintain transport connection through package updates 
When a package is updated, existing bindings to that package's
services are severed and must be manually re-established.  Now
that the transport can be updated outside the system per se,
make sure that we detect these cases and rebind as needed.

Bug 16139912

Change-Id: I5d6fa75bb86484f8f7d4f8e93c9157773995e6a7
 2014-08-21 00:25:53 +00:00
Lorenzo Colitti
827296b7dd Merge "Update state to failed if the VPN fails to connect." into lmp-dev 2014-08-21 00:11:43 +00:00