Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
128,056 Commits 3 Branches 0 Tags
e51f9e2c8e47186f1c2a9bfc644eedcb6ee1a9dc
Commit Graph

34710 Commits

Author SHA1 Message Date
Jeff Brown
e51f9e2c8e am c768e1b6: am 3e1b03e4: am 5693d403: am 96abebd0: am 80af5316: am f260ed09: Merge "Fix inverted conditional in View.setFilterTouchesWhenObscured." into klp-dev 
* commit 'c768e1b673fa02719db3e5323803c0109dd78ec9':
  Fix inverted conditional in View.setFilterTouchesWhenObscured.
 2014-03-19 13:31:43 -07:00
Jeff Brown
c768e1b673 am 3e1b03e4: am 5693d403: am 96abebd0: am 80af5316: am f260ed09: Merge "Fix inverted conditional in View.setFilterTouchesWhenObscured." into klp-dev 
* commit '3e1b03e4e73d46a752537e6dcec9abdf6f5116a6':
  Fix inverted conditional in View.setFilterTouchesWhenObscured.
 2014-03-19 20:28:03 +00:00
Jeff Sharkey
5f01626292 am c1ae44fb: Merge "Define an OEM directory, scan features and APKs." 
* commit 'c1ae44fb8ae76955710d863e69e76c1e80f92927':
  Define an OEM directory, scan features and APKs.
 2014-03-19 13:20:49 -07:00
Jeff Brown
5693d40360 am 96abebd0: am 80af5316: am f260ed09: Merge "Fix inverted conditional in View.setFilterTouchesWhenObscured." into klp-dev 
* commit '96abebd02559137fa320a17c5b7a985d6fc068ba':
  Fix inverted conditional in View.setFilterTouchesWhenObscured.
 2014-03-19 20:16:18 +00:00
Jeff Sharkey
c1ae44fb8a Merge "Define an OEM directory, scan features and APKs." 2014-03-19 20:16:17 +00:00
Jeff Brown
96abebd025 am 80af5316: am f260ed09: Merge "Fix inverted conditional in View.setFilterTouchesWhenObscured." into klp-dev 
* commit '80af53162477385f20956a55305d0c048ef5c1df':
  Fix inverted conditional in View.setFilterTouchesWhenObscured.
 2014-03-19 20:11:12 +00:00
Jeff Brown
80af531624 am f260ed09: Merge "Fix inverted conditional in View.setFilterTouchesWhenObscured." into klp-dev 
* commit 'f260ed09263d60ff941225e31e22d344afd90c0f':
  Fix inverted conditional in View.setFilterTouchesWhenObscured.
 2014-03-19 20:05:40 +00:00
Jeff Brown
f260ed0926 Merge "Fix inverted conditional in View.setFilterTouchesWhenObscured." into klp-dev 2014-03-19 20:01:42 +00:00
Robert Greenwalt
9f13549726 am 1b98e90d: resolved conflicts for merge of 0bff77d6 to master 
* commit '1b98e90db063da97c6bb9d47aa9798c8c32a58b5':
  Handle provisioning APN by turning off/on data.
 2014-03-19 12:50:13 -07:00
Jeff Sharkey
1be762c1ba Define an OEM directory, scan features and APKs. 
To support OEM customizations, define a new top-level directory
that roughly mirrors the layout of the system partition.  Scan this
location for (non-privileged) apps, and for additional features.

Bug: 13340779
Change-Id: Idb6d6626655061ee31ad952cab734d30ea6130b9
 2014-03-19 12:44:48 -07:00
Robert Greenwalt
1b98e90db0 resolved conflicts for merge of 0bff77d6 to master 
Change-Id: Ia4c86126079740978658a05579b56d59d41a7b01
 2014-03-19 12:41:54 -07:00
Robert Greenwalt
45b1e5ec05 am 42b746e4: am bd84f01c: am 5d3d4ee3: Merge "Handle provisioning APN by turning off/on data." into klp-dev 
* commit '42b746e4d8baa6141598ddaae7148baea2ddf366':
  Handle provisioning APN by turning off/on data.
 2014-03-19 19:13:00 +00:00
Robert Greenwalt
42b746e4d8 am bd84f01c: am 5d3d4ee3: Merge "Handle provisioning APN by turning off/on data." into klp-dev 
* commit 'bd84f01c6ce122ab58fc7c5b687dc8bfb0fb03e6':
  Handle provisioning APN by turning off/on data.
 2014-03-19 19:08:44 +00:00
Robert Greenwalt
bd84f01c6c am 5d3d4ee3: Merge "Handle provisioning APN by turning off/on data." into klp-dev 
* commit '5d3d4ee3005e910dce780074d3f68d594aa12070':
  Handle provisioning APN by turning off/on data.
 2014-03-19 16:15:22 +00:00
Robert Greenwalt
5d3d4ee300 Merge "Handle provisioning APN by turning off/on data." into klp-dev 2014-03-19 16:12:01 +00:00
Zhijun He
f61f79519c am 555084b3: Merge "Camera2: Update exposureTimeRange related docs" 
* commit '555084b3a55719e1bf33974f0a8334ee345fc3dd':
  Camera2: Update exposureTimeRange related docs
 2014-03-18 19:15:35 -07:00
Zhijun He
555084b3a5 Merge "Camera2: Update exposureTimeRange related docs" 2014-03-19 02:12:08 +00:00
Dave Platt
c76bccd6ea am 17e7c407: am 98a027a5: Merge "Harden NsdManager against null-dereference crashes" into klp-dev 
* commit '17e7c4076b8f1617ed397dae570e9d5240cd9c1b':
  Harden NsdManager against null-dereference crashes
 2014-03-19 00:59:47 +00:00
Jeff Brown
aba566589e Fix inverted conditional in View.setFilterTouchesWhenObscured. 
Bug: 13530806
Change-Id: Icdaf909c355f5b22635e1060f2190502916b144f
 2014-03-18 17:59:21 -07:00
Dave Platt
17e7c4076b am 98a027a5: Merge "Harden NsdManager against null-dereference crashes" into klp-dev 
* commit '98a027a506b5acff1a7ab0cc3655399da7d025c7':
  Harden NsdManager against null-dereference crashes
 2014-03-19 00:54:54 +00:00
Dave Platt
98a027a506 Merge "Harden NsdManager against null-dereference crashes" into klp-dev 2014-03-19 00:50:30 +00:00
Zhijun He
ca2926f83b Camera2: Update exposureTimeRange related docs 
Bug: 13250951
Change-Id: I8a77feb1b9877c75fd5a41a324fe17605ed338e0
 2014-03-18 16:21:45 -07:00
Ashish Sharma
e53c413291 am 0535a9f7: Include elapsed realtime (nanos) of the event in the radio state change notifications. 
* commit '0535a9f7aa5d0f875b06845e9af5f6dbfc5c8a19':
  Include elapsed realtime (nanos) of the event in the radio state change notifications.
 2014-03-18 14:48:52 -07:00
Ashish Sharma
0535a9f7aa Include elapsed realtime (nanos) of the event in the radio state change notifications. 
Bug: 13247811
Change-Id: I3454aa159a68b9087b4762df947b41965b5a3941
 2014-03-18 21:42:02 +00:00
Doug Zongker
0121bda365 am dd23853e: am 06fe82d8: am 2e6d960c: am cdf00888: add option to shutdown after factory reset 
* commit 'dd23853e6383df8f21c73bb01c2b665e28850822':
  add option to shutdown after factory reset
 2014-03-18 14:05:40 -07:00
Doug Zongker
dd23853e63 am 06fe82d8: am 2e6d960c: am cdf00888: add option to shutdown after factory reset 
* commit '06fe82d8e01780b7b6c16364f81f8dd75d467420':
  add option to shutdown after factory reset
 2014-03-18 21:00:04 +00:00
Doug Zongker
2e6d960c85 am cdf00888: add option to shutdown after factory reset 
* commit 'cdf008883921c2eb7daf10c82687e9a36461eb16':
  add option to shutdown after factory reset
 2014-03-18 20:49:12 +00: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
Ruben Brunk
8725e00648 am 6dc379c7: hal3: Add missing available mode tags. 
* commit '6dc379c7bd34d9707ee2ef819a5a07afc2aa9314':
  hal3: Add missing available mode tags.
 2014-03-18 11:23:55 -07:00
Ruben Brunk
6dc379c7bd hal3: Add missing available mode tags. 
Change-Id: I588aacade5c5638967970e2e7eb04924c0ea9cc7
 2014-03-18 11:13:44 -07:00
Svetoslav
f55c513906 am fcf3b103: Merge "Update print docs" 
* commit 'fcf3b103f0fc275aeefbe548804b51c26f4385a5':
  Update print docs
 2014-03-18 11:04:23 -07:00
Svetoslav
fcf3b103f0 Merge "Update print docs" 2014-03-18 18:00:01 +00:00
Wink Saville
c8e8e3eba6 Handle provisioning APN by turning off/on data. 
This is a start and two tests succeed:

Tested expired AT&T SIM and waiting 15min for alarm to fire.
Tested a provisioned Verizon SIM and works normally.

I've NOT tested AT&T where I've properly completed the provisioning.
I've NOT tested T-Mobile SIM either provisioned or not-provisioned.
I've NOT tested provisioning over WiFi.
I've NOT tested that WiFi <-> Mobile works
I've NOT tested voice calls, SMS, MMS
...

The current bug is below, but it is poorly named either it should be
renamed or a new bug created.

Bug: 13190133
Change-Id: I0a09f642614cd27a8655e9dae764b8999ce485b8
 2014-03-18 10:58:40 -07:00
Svetoslav
85a85a0ed7 Update print docs 
Change-Id: I671ad776968ca2802f05f94f7cc96959fb50fa4b
 2014-03-18 10:48:51 -07:00
Svetoslav
34fca683eb am 73832594: Merge "Updated print docs." 
* commit '73832594b31fe110a24329aad9bf611412600e71':
  Updated print docs.
 2014-03-18 10:45:40 -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
Dianne Hackborn
95c5d44b64 am e9ebd60f: Merge "Treat IME processes as hosting activities" 
* commit 'e9ebd60fc4dd32a57784e8d9c7dcb8b599d25f75':
  Treat IME processes as hosting activities
 2014-03-18 09:54:07 -07:00
Dianne Hackborn
e9ebd60fc4 Merge "Treat IME processes as hosting activities" 2014-03-18 16:50:25 +00:00
Kenny Guy
2f0c30daa9 am ecc9f9b6: Merge "Add flag to allow fetching related users recent tasks." 
* commit 'ecc9f9b6f308316ff2a8f6e2b6f642724533ba80':
  Add flag to allow fetching related users recent tasks.
 2014-03-18 05:29:35 -07:00
Kenny Guy
ecc9f9b6f3 Merge "Add flag to allow fetching related users recent tasks." 2014-03-18 11:43:46 +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
654818a9e3 am 95478f67: Merge "Make InternalListener static to avoid referencing SpeechRecognizer." 
* commit '95478f67a459490d2dd6c1fa525c29ef90b34b93':
  Make InternalListener static to avoid referencing SpeechRecognizer.
 2014-03-17 19:01:20 -07:00
Mark Renouf
297990806d Make InternalListener static to avoid referencing SpeechRecognizer. 
Change-Id: I03bc1a5f5188551608395f3468aa69e622601820
(cherry picked from commit b37866db46)
 2014-03-18 01:58:39 +00:00
Mark Renouf
95478f67a4 Merge "Make InternalListener static to avoid referencing SpeechRecognizer." 2014-03-18 01:58:26 +00:00
Wonsik Kim
dd659c530d am edb67190: Merge "Revert "VideoPlaneView initial implementation"" 
* commit 'edb67190d65659ff1da563f1d081d9429bd31a31':
  Revert "VideoPlaneView initial implementation"
 2014-03-17 18:03:48 -07:00
Wonsik Kim
edb67190d6 Merge "Revert "VideoPlaneView initial implementation"" 2014-03-18 01:00:59 +00:00
Alan Viverette
da7062030d am 97d9b654: Lower tap timeout to 100ms, because 180ms is a lot of ms 
* commit '97d9b65470957ce4c9983921bd59c4cf902885ce':
  Lower tap timeout to 100ms, because 180ms is a lot of ms
 2014-03-17 16:29:58 -07:00
Alan Viverette
97d9b65470 Lower tap timeout to 100ms, because 180ms is a lot of ms 
Change-Id: I708848480544825474785e0918feba70c1089090
 2014-03-17 16:16:33 -07:00
Dianne Hackborn
f0f94d129b Treat IME processes as hosting activities 
When we stop using an IME process, we still treat that
process as if it is hosting activities (in the activity part
of the LRU list), to try to keep it around.  This is intended
to help the experience of switching between IMEs, reducing
the chance of your previous IME process being killed and thus
requiring much more time to switch.

Change-Id: Ie5793fd9b40d980fa18f80246326511ed6ae0597
 2014-03-17 16:04:21 -07:00