Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
162,678 Commits 3 Branches 0 Tags
07317da6834cc35fe8fad519bb60f15ba68bcd48
Commit Graph

162678 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
07317da683 am cbb286b8: Merge "Do not defer removal for empty tasks or activities" into lmp-mr1-dev 
* commit 'cbb286b8594c56161f2765023a73d8200e426f9b':
  Do not defer removal for empty tasks or activities
 2015-01-20 22:32:16 +00:00
Craig Mautner
cbb286b859 Merge "Do not defer removal for empty tasks or activities" into lmp-mr1-dev 2015-01-20 22:26:11 +00:00
Craig Mautner
0c4d81cf13 Do not defer removal for empty tasks or activities 
It is possible for empty activities to be leaked if their last
window is removed before animations finish. This change keeps tasks
and activities from having removal deferred if they have no windows.

Fixes bug 19047432

Change-Id: If6562f46bbfcac9ba987e2c834a1d55a9a8f3766
 2015-01-20 13:57:27 -08:00
Adam Lesinski
554a6f5278 am aee7225e: Merge "Process base APK" into lmp-mr1-dev 
* commit 'aee7225e34376a90e8c25e5df53604085cc1b712':
  Process base APK
 2015-01-20 21:48:03 +00:00
Adam Lesinski
aee7225e34 Merge "Process base APK" into lmp-mr1-dev 2015-01-20 21:41:46 +00:00
Christopher Tate
5afc62cd39 Merge "Don\'t write widget metadata to backup unless it\'s new/changed" into lmp-mr1-dev 
automerge: 7651dcb

* commit '7651dcb92193a5a970a2554e067ec14d6fcad802':
  Don't write widget metadata to backup unless it's new/changed
 2015-01-20 21:26:56 +00:00
Christopher Tate
7651dcb921 Merge "Don't write widget metadata to backup unless it's new/changed" into lmp-mr1-dev 2015-01-20 21:24:00 +00:00
Wale Ogunwale
7fd985f2c6 am 92dd1abe: Update restored task uid to match the package uid on current device. 
* commit '92dd1abef4c0a22db40c5f7bbd100e6b471a1ad3':
  Update restored task uid to match the package uid on current device.
 2015-01-20 20:58:26 +00:00
Wale Ogunwale
92dd1abef4 Update restored task uid to match the package uid on current device. 
The uid on the task we are restoring from another device are
meaningless on the current device. Change updates the uid of any
task we restore to match the package uid on the current device.

Bug: 19014377
Change-Id: I285fbe9f509cae3d2e9a212a59e88f34b4db20e5
 2015-01-20 12:52:07 -08:00
Ricardo Cervera
046dc08962 am 7c002d75: am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 automerge: e8f6bd4 automerge: eada048 automerge: 458f432 automerge: 47e274c 
* commit '7c002d75b62585c3598a4a5a93647a3323e90b8d':
 2015-01-20 18:38:40 +00:00
Ricardo Cervera
7c002d75b6 am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 automerge: e8f6bd4 automerge: eada048 automerge: 458f432 
automerge: 47e274c

* commit '47e274c56a0662e3e2aef24f2a458cc078e70fd8':
 2015-01-20 18:32:22 +00:00
Ricardo Cervera
47e274c56a am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 automerge: e8f6bd4 automerge: eada048 
automerge: 458f432

* commit '458f4326bdff638cefe175b179a487872cf678c1':
 2015-01-20 18:10:49 +00:00
Ricardo Cervera
458f4326bd am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 automerge: e8f6bd4 
automerge: eada048

* commit 'eada048addc14a95ced54b17c6a75f5f899e2c2a':
 2015-01-20 18:03:50 +00:00
Ricardo Cervera
eada048add am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 
automerge: e8f6bd4

* commit 'e8f6bd484627e16fa2fd9509b0f06056ee44be94':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-20 17:57:45 +00:00
Geoff Mendal
8a28956d5e Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-01-19 15:07:39 +00:00
Geoff Mendal
03488d2f0f Import translations. DO NOT MERGE 
Change-Id: Ibcf24ef2774ef4c96d75daca257c202686e630da
Auto-generated-cl: translation import
 2015-01-19 09:05:34 -06:00
Geoff Mendal
c7f4582c41 am 2bc2a994: (-s ours) Import translations. DO NOT MERGE 
* commit '2bc2a99406d1d0a4a6c0a6a5ec39f5f9273a1634':
  Import translations. DO NOT MERGE
 2015-01-19 14:59:18 +00:00
Geoff Mendal
2bc2a99406 Import translations. DO NOT MERGE 
Change-Id: If4c684beabdf14e6dad7c9584ac9b9cb0fb048d0
Auto-generated-cl: translation import
 2015-01-19 06:49:11 -08:00
Jinsuk Kim
d38f077b10 am 5b8cb00b: CEC: Process new options for CEC/MHL HAL 
* commit '5b8cb00b8a302329b98a5528eaa7934d0f5c3e65':
  CEC: Process new options for CEC/MHL HAL
 2015-01-19 02:25:48 +00:00
Jinsuk Kim
4d37a3584c am bbfec56d: Merge "CEC: Make TV try to allocate logical address 0 first" into lmp-mr1-dev 
* commit 'bbfec56dfcb1fdcb0307b3df83e2ad855c0b0b88':
  CEC: Make TV try to allocate logical address 0 first
 2015-01-19 02:25:44 +00:00
Jinsuk Kim
5b8cb00b8a CEC: Process new options for CEC/MHL HAL 
1) Inform MHL HAL of OPTION_MHL_SERVICE_CONTROL at system
ready/standby event.

2) Call OPTION_CEC_SET_LANGUAGE with current system language info
for HAL to be able to respond to <Get Menu Language> while in standby
mode.

Bug: 19054079
Change-Id: I92c9f392a94f70e11157d20a33163ef2d8bc832f
 2015-01-19 02:22:05 +00:00
Jinsuk Kim
bbfec56dfc Merge "CEC: Make TV try to allocate logical address 0 first" into lmp-mr1-dev 2015-01-19 02:20:18 +00:00
Jinsuk Kim
d47abefc82 CEC: Make TV try to allocate logical address 0 first 
HDMI Spec says TV shall try to allocate TV() logical address, unlike
other kinds of devices that are recommended to use the previously
allocated one.

Also included are small changes:

- reply with 'can not provide source' if TV has no source to provide
- return the present device info if we have one at the given path

Bug: 19045081
Change-Id: Icf17cb581f0ef2274e252ec5665f80bb1c08b494
 2015-01-19 10:44:38 +09:00
Sanket Padawe
543348eb94 am d2dd69ae: Merge "Modify getDeviceId() to get device id independent of Subscription." into lmp-mr1-dev 
* commit 'd2dd69ae8d81defc5f2286690b3dd246d4118fcc':
  Modify getDeviceId() to get device id independent of Subscription.
 2015-01-17 22:20:19 +00:00
Sanket Padawe
d2dd69ae8d Merge "Modify getDeviceId() to get device id independent of Subscription." into lmp-mr1-dev 2015-01-17 22:15:56 +00:00
Scott Rowe
11ce4b7594 am c68ab86a: am ae15e779: am 224624e8: am c987ca05: Merge "docs: removing code captions" into lmp-docs 
* commit 'c68ab86a8cef8b8ca4588e7eb482c5acf9821aa9':
  docs: removing code captions
 2015-01-17 05:25:25 +00:00
Scott Rowe
e019bbb161 am 278f5e2a: am 49caa638: am 78001f93: am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs 
* commit '278f5e2a63961f468457ab00ceeaec84aff7bc61':
  docs: Add screenshot
 2015-01-17 05:25:20 +00:00
Scott Rowe
c68ab86a8c am ae15e779: am 224624e8: am c987ca05: Merge "docs: removing code captions" into lmp-docs 
* commit 'ae15e779c0a0a9005292efb0f39729454429fa7f':
  docs: removing code captions
 2015-01-17 05:20:28 +00:00
Scott Rowe
278f5e2a63 am 49caa638: am 78001f93: am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs 
* commit '49caa6386c1423ad9ced3e3ad983dd233a76e2e4':
  docs: Add screenshot
 2015-01-17 05:20:23 +00:00
Scott Rowe
ae15e779c0 am 224624e8: am c987ca05: Merge "docs: removing code captions" into lmp-docs 
* commit '224624e8e68bd1debd0f76d1b614ae3bdc637cb2':
  docs: removing code captions
 2015-01-17 03:06:38 +00:00
Scott Rowe
49caa6386c am 78001f93: am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs 
* commit '78001f9338b72876e95b7d25053b706804a21070':
  docs: Add screenshot
 2015-01-17 03:06:35 +00:00
Scott Rowe
224624e8e6 am c987ca05: Merge "docs: removing code captions" into lmp-docs 
* commit 'c987ca05010a8cc06572d5b04c93fb6404f8bf45':
  docs: removing code captions
 2015-01-17 02:28:51 +00:00
Scott Rowe
78001f9338 am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs 
* commit 'ab18d6c82eb92732ef7ab54adffcd27faffd0c57':
  docs: Add screenshot
 2015-01-17 02:28:47 +00:00
Scott Rowe
c987ca0501 Merge "docs: removing code captions" into lmp-docs 2015-01-17 01:31:53 +00:00
Scott Rowe
ab18d6c82e Merge "docs: Add screenshot" into lmp-docs 2015-01-17 01:31:15 +00:00
David Friedman
912a939439 am 91678a69: am ae71c8ea: am e255cb0f: am fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs 
* commit '91678a69b26f218dd580704cd4f79c295c8c5951':
  Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
 2015-01-17 00:51:42 +00:00
David Friedman
91678a69b2 am ae71c8ea: am e255cb0f: am fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs 
* commit 'ae71c8ea52af7e4205ae838e73837d145f416e1a':
  Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
 2015-01-17 00:43:30 +00:00
David Friedman
ae71c8ea52 am e255cb0f: am fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs 
* commit 'e255cb0f9e0ecd5f0aa2c963f1a6d4c7029c85af':
  Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
 2015-01-17 00:36:27 +00:00
David Friedman
e255cb0f9e am fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs 
* commit 'fa66fdd57a494bed0a92d9fb0aadf332395f371f':
  Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
 2015-01-17 00:30:18 +00:00
David Friedman
fa66fdd57a Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs 2015-01-17 00:23:30 +00:00
David Friedman
d28a49fb73 Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw 
Change-Id: I6555b9894a9ae4dc9365f21b40a75627fb7ed63f
 2015-01-16 15:42:26 -08:00
RoboErik
694940be69 am d5ff63ba: Merge "Notify the system of all remote volume changes" into lmp-mr1-dev 
* commit 'd5ff63ba0ce8597155e0201fd20fe18fbf0aa053':
  Notify the system of all remote volume changes
 2015-01-16 23:04:10 +00:00
RoboErik
d5ff63ba0c Merge "Notify the system of all remote volume changes" into lmp-mr1-dev 2015-01-16 22:56:54 +00:00
Quddus Chong
20eb8093b6 am 2f63207d: am a6491229: am 930ac01f: am de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs 
* commit '2f63207d873fcd2c39488f78b5cb1b67f868f232':
  docs: Fixed typos in Game Controller training code snippets. bug: 17959906
 2015-01-16 22:44:07 +00:00
Quddus Chong
2f63207d87 am a6491229: am 930ac01f: am de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs 
* commit 'a649122977a6f1c267329b9b67a692cabd839e98':
  docs: Fixed typos in Game Controller training code snippets. bug: 17959906
 2015-01-16 22:35:03 +00:00
Joe Fernandez
ff96449f1d am 35aecbe9: am cd500663: am 90d2aca7: am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs 
* commit '35aecbe92761c7608ce3942f5743bae8254fdaf6':
  docs: adding studio-sample-in-editor.png file
 2015-01-16 22:34:46 +00:00
Ricardo Cervera
3fee7dc78a am 7a2e85c8: am 9273b33f: am 73f36d47: am e229751d: docs: Add browseable Wearable Support Lib Javadoc 
* commit '7a2e85c83eabe113ca05d2ecf4633008d601a560':
  docs: Add browseable Wearable Support Lib Javadoc
 2015-01-16 22:34:42 +00:00
Joe Fernandez
35aecbe927 am cd500663: am 90d2aca7: am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs 
* commit 'cd50066386887148f99dce9b449bed588a354bb3':
  docs: adding studio-sample-in-editor.png file
 2015-01-16 22:29:48 +00:00
Ricardo Cervera
7a2e85c83e am 9273b33f: am 73f36d47: am e229751d: docs: Add browseable Wearable Support Lib Javadoc 
* commit '9273b33f6ecfa20ff524ae6fcb88f2586c79b6da':
  docs: Add browseable Wearable Support Lib Javadoc
 2015-01-16 22:29:43 +00:00
Quddus Chong
a649122977 am 930ac01f: am de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs 
* commit '930ac01fd728067a79335e2983b870528c13a872':
  docs: Fixed typos in Game Controller training code snippets. bug: 17959906
 2015-01-16 22:28:24 +00:00