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

125781 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adrian Roos
d3da8f711e am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug 
* commit 'ecba937b005b07d72eadfaf93a200e0b14af2980':
  DO NOT MERGE - Fix keyguard pattern lockout bug
 2014-03-18 13:17:12 -07:00
Doug Zongker
cdf0088839 add option to shutdown after factory reset 
Add a new hidden method to recovery system to trigger a factory reset
followed by a shutdown, rather than a reboot back to the regular
system.  Use this flag when the MASTER_CLEAR intent is broadcast with
a boolean extra "shutdown" set to true.

Change-Id: I2ceb25b715d9f0ef492a75b3d287d1e17cec89ef
 2014-03-18 12:52:04 -07:00
Craig Mautner
157b645e5d Merge "Fix activities appearing behind home icons" 2014-03-18 19:24:29 +00:00
Dianne Hackborn
a2a13718d0 am 7987d84e: am d1d91eca: am 7cb1dfe6: Merge "Insufficient ProcessRecord cleanup when persistent process is killed" 
* commit '7987d84e35fb8d7a20ef33786906968e8b7f2dc2':
  Insufficient ProcessRecord cleanup when persistent process is killed
 2014-03-18 18:42:45 +00:00
Dianne Hackborn
7987d84e35 am d1d91eca: am 7cb1dfe6: Merge "Insufficient ProcessRecord cleanup when persistent process is killed" 
* commit 'd1d91eca3e78f2074b110a0e3530aeff6deef6fe':
  Insufficient ProcessRecord cleanup when persistent process is killed
 2014-03-18 18:36:53 +00:00
Dianne Hackborn
d1d91eca3e am 7cb1dfe6: Merge "Insufficient ProcessRecord cleanup when persistent process is killed" 
* commit '7cb1dfe690b2d700ce212712287dfd59c2c8e43f':
  Insufficient ProcessRecord cleanup when persistent process is killed
 2014-03-18 11:31:34 -07:00
Dianne Hackborn
7cb1dfe690 Merge "Insufficient ProcessRecord cleanup when persistent process is killed" 2014-03-18 18:28:16 +00:00
Xia Wang
01f03b50fb Fix state transition verification. 
When there is connectivity state change, the network states could be broadcasted multiple times.
The state transition should consider that.

Bug: 13277256
Change-Id: I3d400900a0e2454f9d198629f1c062cbb15bdcd8
(cherry picked from commit 71aae0b6fd1bb9204b81c2e9447f3544c29579c4)
 2014-03-18 18:23:05 +00:00
Ruben Brunk
6dc379c7bd hal3: Add missing available mode tags. 
Change-Id: I588aacade5c5638967970e2e7eb04924c0ea9cc7
 2014-03-18 11:13:44 -07:00
Svetoslav
fcf3b103f0 Merge "Update print docs" 2014-03-18 18:00:01 +00:00
Svetoslav
85a85a0ed7 Update print docs 
Change-Id: I671ad776968ca2802f05f94f7cc96959fb50fa4b
 2014-03-18 10:48:51 -07:00
Svetoslav
73832594b3 Merge "Updated print docs." 2014-03-18 17:43:13 +00:00
Svetoslav
81f14b9689 Updated print docs. 
Added an explanation why the system cannot maintain print UI
state on rotation.

Change-Id: I370158ba4be929b67a4b5476ccacad5335d18b34
 2014-03-18 10:42:16 -07:00
Adrian Roos
ecba937b00 DO NOT MERGE - Fix keyguard pattern lockout bug 
(cherry picked from commit 91c9561cbe665f91e1665f30362c409ae180b127)

Bug: 13302967
Change-Id: I35e7319f8767b2320dc11d9bfe8dc034e2a39b28
 2014-03-18 18:33:14 +01:00
Ricardo Cervera
adbd67d8f7 am 342eb1f5: am 808779d1: am 965e5e85: am ace69017: docs: Reverted ADT 22.6.1 links 
* commit '342eb1f522eae48706cdc1c029620a9f16f2bf53':
  docs: Reverted ADT 22.6.1 links
 2014-03-18 17:30:52 +00:00
Ricardo Cervera
342eb1f522 am 808779d1: am 965e5e85: am ace69017: docs: Reverted ADT 22.6.1 links 
* commit '808779d1898a9011a8a4e05e6cfb2f005ecae47c':
  docs: Reverted ADT 22.6.1 links
 2014-03-18 17:22:58 +00:00
Ricardo Cervera
808779d189 am 965e5e85: am ace69017: docs: Reverted ADT 22.6.1 links 
* commit '965e5e8520d040ce7e064db665982eb98c626b2b':
  docs: Reverted ADT 22.6.1 links
 2014-03-18 17:17:30 +00:00
Ricardo Cervera
965e5e8520 am ace69017: docs: Reverted ADT 22.6.1 links 
* commit 'ace69017443eac3101bf5e36f863fd3cf80cce9f':
  docs: Reverted ADT 22.6.1 links
 2014-03-18 17:11:58 +00:00
Ricardo Cervera
ace6901744 docs: Reverted ADT 22.6.1 links 
Change-Id: Ic08cd7df8d50235e6a673f00dda6baa6863c9025
 2014-03-18 10:02:06 -07:00
Dan Stoza
72191f3dc1 Merge "Remove deprecated BufferQueue constructor" 2014-03-18 16:55:57 +00:00
Dianne Hackborn
e9ebd60fc4 Merge "Treat IME processes as hosting activities" 2014-03-18 16:50:25 +00:00
John Reck
3ebdf00217 Merge "Fix functor removal" 2014-03-18 16:35:49 +00:00
Craig Mautner
95e9daab03 Fix activities appearing behind home icons 
Notify the Window Manager when a task has been moved to the front.

Fixes bug 13410184.

Change-Id: I85ec63ae6d1dbd917ba2288b1486f531a69dd1a0
 2014-03-18 09:32:47 -07:00
John Reck
16efa9a330 Fix functor removal 
Bug: 12179257

Change-Id: Ib63a351b1b289b08452f17086cb6c8b688e2ba4d
 2014-03-18 09:24:28 -07:00
Kenny Root
d54a57f5db Merge "Use the correct package name for CHOOSER" 2014-03-18 16:14:58 +00:00
Scott Main
ecaa91f870 am b850e27f: am 0dc98290: am 89f0e768: am f60dd6e2: am 50d7dc99: add ALL of the Android Wear Dev Preview docs to DAC these were built from the klp-cw-preview-release branch. 
* commit 'b850e27f3e9edff3ec04482129590f629b5f54fb':
  add ALL of the Android Wear Dev Preview docs to DAC these were built from the klp-cw-preview-release branch.
 2014-03-18 13:04:46 +00:00
Scott Main
b850e27f3e am 0dc98290: am 89f0e768: am f60dd6e2: am 50d7dc99: add ALL of the Android Wear Dev Preview docs to DAC these were built from the klp-cw-preview-release branch. 
* commit '0dc98290c093ef1ba185377f6716189c2b42fda9':
  add ALL of the Android Wear Dev Preview docs to DAC these were built from the klp-cw-preview-release branch.
 2014-03-18 13:00:42 +00:00
Scott Main
0dc98290c0 am 89f0e768: am f60dd6e2: am 50d7dc99: add ALL of the Android Wear Dev Preview docs to DAC these were built from the klp-cw-preview-release branch. 
* commit '89f0e768139c5d39d971e9fce9b7120857f9430d':
  add ALL of the Android Wear Dev Preview docs to DAC these were built from the klp-cw-preview-release branch.
 2014-03-18 12:57:30 +00:00
Scott Main
89f0e76813 am f60dd6e2: am 50d7dc99: add ALL of the Android Wear Dev Preview docs to DAC these were built from the klp-cw-preview-release branch. 
* commit 'f60dd6e2d2765b01018da69dc9ee776e50b47431':
  add ALL of the Android Wear Dev Preview docs to DAC these were built from the klp-cw-preview-release branch.
 2014-03-18 12:54:45 +00:00
Scott Main
f60dd6e2d2 am 50d7dc99: add ALL of the Android Wear Dev Preview docs to DAC these were built from the klp-cw-preview-release branch. 
* commit '50d7dc99e507082c81476ea1474de9970589dee5':
  add ALL of the Android Wear Dev Preview docs to DAC these were built from the klp-cw-preview-release branch.
 2014-03-18 12:51:40 +00:00
Scott Main
50d7dc99e5 add ALL of the Android Wear Dev Preview docs to DAC 
these were built from the klp-cw-preview-release branch.

Change-Id: I9beef683528cfe57b4d088fe7adeb1638b89a640
 2014-03-18 05:41:12 -07:00
Scott Main
eaa1330944 am 91991a40: am f9bf4052: am e77c260b: am 60409d80: am 81857ec5: add android wear to the home carousel 
* commit '91991a409e2da3d0400135799edabec7be505b3a':
  add android wear to the home carousel
 2014-03-18 12:18:57 +00:00
Scott Main
91991a409e am f9bf4052: am e77c260b: am 60409d80: am 81857ec5: add android wear to the home carousel 
* commit 'f9bf40521f4f3ba44f5f8bef12b508e307ae7e22':
  add android wear to the home carousel
 2014-03-18 12:16:05 +00:00
Scott Main
f9bf40521f am e77c260b: am 60409d80: am 81857ec5: add android wear to the home carousel 
* commit 'e77c260b3aa86d97643a69da75cd03ac1e7cef23':
  add android wear to the home carousel
 2014-03-18 12:13:08 +00:00
Scott Main
e77c260b3a am 60409d80: am 81857ec5: add android wear to the home carousel 
* commit '60409d802e5df6f85f1f91036327a146b48601c1':
  add android wear to the home carousel
 2014-03-18 12:09:53 +00:00
Scott Main
60409d802e am 81857ec5: add android wear to the home carousel 
* commit '81857ec572b133f99cdbcd575774eb5f9be073b0':
  add android wear to the home carousel
 2014-03-18 12:05:40 +00:00
Kenny Guy
ecc9f9b6f3 Merge "Add flag to allow fetching related users recent tasks." 2014-03-18 11:43:46 +00:00
Scott Main
81857ec572 add android wear to the home carousel 
Change-Id: I1dc50100dd50a710a23b08f677121d499c166b3f
 2014-03-18 03:04:40 -07:00
Narayan Kamath
5b3dad0804 am 6cf9aa2e: am b4b431b0: am d2133079: am 7c0dfed5: Merge "Pass int32_t for JNI calls to java Input/Output streams." 
* commit '6cf9aa2e5cb0e65ecda9617304af19c827404e1a':
  Pass int32_t for JNI calls to java Input/Output streams.
 2014-03-18 09:50:15 +00:00
Narayan Kamath
6cf9aa2e5c am b4b431b0: am d2133079: am 7c0dfed5: Merge "Pass int32_t for JNI calls to java Input/Output streams." 
* commit 'b4b431b0d2f6d57afe80c4119e5f41e4fb72e7d9':
  Pass int32_t for JNI calls to java Input/Output streams.
 2014-03-18 09:45:25 +00:00
Narayan Kamath
b4b431b0d2 am d2133079: am 7c0dfed5: Merge "Pass int32_t for JNI calls to java Input/Output streams." 
* commit 'd2133079c085cb0879facc8ee72678524d22571a':
  Pass int32_t for JNI calls to java Input/Output streams.
 2014-03-18 09:41:31 +00:00
Narayan Kamath
d2133079c0 am 7c0dfed5: Merge "Pass int32_t for JNI calls to java Input/Output streams." 
* commit '7c0dfed535bd23ce7cce0f8c498a8d6d3f14ff0f':
  Pass int32_t for JNI calls to java Input/Output streams.
 2014-03-18 02:38:24 -07:00
Narayan Kamath
7c0dfed535 Merge "Pass int32_t for JNI calls to java Input/Output streams." 2014-03-18 09:34:43 +00:00
Akira Numata
eff08c4ffe Insufficient ProcessRecord cleanup when persistent process is killed 
When persistent process with Service restarts, ActivityManagerService
does not reset ProcessRecord#hasClientActivites to false
(because ProcessRecord of persistent process is continued using
after killing).

It disturbs updating LRU list in ActivityManagerService, and then,
when new process calls ActivityManagerProxy#publishContentProviders,
SecurityException happens because of no entry in the list.

Bug: 13517358

Change-Id: I46b064f71a4f7025ade1bf117801352a7ab22e6a
 2014-03-18 05:41:30 +00:00
Mark Renouf
c1814d260a am ae92a77d: am bb015714: am 29799080: Make InternalListener static to avoid referencing SpeechRecognizer. 
* commit 'ae92a77d2bc1a053aed7e1e7efeff68f5b003e1d':
  Make InternalListener static to avoid referencing SpeechRecognizer.
 2014-03-18 02:10:00 +00:00
Winson Chung
93bb3969c1 Merge "Fixing issue with cards being rendered under the nav bar after a configuration change due to improperly setting the system insets." 2014-03-18 02:09:37 +00:00
Winson Chung
bb5278b663 Fixing issue with cards being rendered under the nav bar after a configuration change due to improperly setting the system insets. 2014-03-17 19:07:56 -07:00
Mark Renouf
ae92a77d2b am bb015714: am 29799080: Make InternalListener static to avoid referencing SpeechRecognizer. 
* commit 'bb015714274ef9fd613e15a6d4b51716504c3d0b':
  Make InternalListener static to avoid referencing SpeechRecognizer.
 2014-03-18 02:06:13 +00:00
Mark Renouf
bb01571427 am 29799080: Make InternalListener static to avoid referencing SpeechRecognizer. 
* commit '297990806dcbdc4413314847b897c9cb5452a1bc':
  Make InternalListener static to avoid referencing SpeechRecognizer.
 2014-03-18 02:02:59 +00:00
Mark Renouf
297990806d Make InternalListener static to avoid referencing SpeechRecognizer. 
Change-Id: I03bc1a5f5188551608395f3468aa69e622601820
(cherry picked from commit b37866db469e81aca534ff6186bdafd44352329b)
 2014-03-18 01:58:39 +00:00