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

37610 Commits

Author SHA1 Message Date
Wei Wang
e950bed144 am b4b66d2f: Merge "Move advetise clean up to callback code. fixes b/13289050" 
* commit 'b4b66d2f3afe8154efeb86389bc47c046d21aecf':
  Move advetise clean up to callback code. fixes b/13289050
 2014-03-19 17:15:19 -07:00
Wei Wang
b4b66d2f3a Merge "Move advetise clean up to callback code. fixes b/13289050" 2014-03-20 00:12:23 +00:00
Wei Wang
809476525f Move advetise clean up to callback code. fixes b/13289050 
Change-Id: Ibf3c772561125821817c947730cf21defafd4cb2
 2014-03-20 00:04:27 +00:00
John Spurlock
4caf365abd am 87c28e27: Merge "Fix javadoc @links in Vibrator." 
* commit '87c28e27c5c5ba7b8ad2944d299b05678e2ae87f':
  Fix javadoc @links in Vibrator.
 2014-03-19 16:34:48 -07:00
John Spurlock
a1bfe65daa Fix javadoc @links in Vibrator. 
Change-Id: I5143334735a1bcdf8252687e703c74656ff9d126
 2014-03-19 19:29:34 -04:00
John Spurlock
f198863c3c am 07cf4da1: Merge "Add stream-level suppression to vibrate/audio services." 
* commit '07cf4da1d004b145ba8b9055bbff314ef68528f3':
  Add stream-level suppression to vibrate/audio services.
 2014-03-19 15:02:26 -07:00
John Spurlock
07cf4da1d0 Merge "Add stream-level suppression to vibrate/audio services." 2014-03-19 21:58:19 +00:00
Wei Wang
6934ac0154 am ffbea5c7: Merge "Add status callback for start/stop advertising. Fixes b/13289050, b/13418851, also fixes 13418671." 
* commit 'ffbea5c7daf2584039cda0a3a14b35433f789f19':
  Add status callback for start/stop advertising. Fixes b/13289050, b/13418851, also fixes 13418671.
 2014-03-19 14:32:59 -07:00
Wei Wang
ffbea5c7da Merge "Add status callback for start/stop advertising. Fixes b/13289050, b/13418851, also fixes 13418671." 2014-03-19 21:29:59 +00:00
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
John Spurlock
1af30c7ac4 Add stream-level suppression to vibrate/audio services. 
- Add new audio restriction layer to app-ops.  Restrictions add
additional constraints to audio operations at a stream-level.
Restrictions do not affect the persistable state, and are purely
additive: that is, they can only impose additional contstraints, not
enable something that has already been disabled.  Restrictions
also support a whitelisted set of exempt package names.

- Add new audio stream-level checks to app-ops.

- Implement a provisional OP_PLAY_AUDIO suppression to three
java entry points MediaPlayer, AudioTrack, & SoundPool.

- Enhance vibrator api to take stream information as an optional
hint - the constants correspond to AudioManager stream types.
OP_VIBRATE now supports the stream-level restriction check.

- Simplify Vibrator subclasses by adding default implementations
for two .vibrate calls.

- Migrate NoMan's zen-mode control to use the new app-ops
stream-level restriction mechanism.

Change-Id: Ifae8952647202f728cf1c73e881452660c704678
 2014-03-19 15:32:51 -04: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
George Mount
5ad0488fd0 am 31dc8f70: Merge "Fix ActionBar layout bug when INVISIBLE." 
* commit '31dc8f701fb14e185bf1c1b35d68bd7d1a42a54a':
  Fix ActionBar layout bug when INVISIBLE.
 2014-03-19 07:30:41 -07:00
George Mount
31dc8f701f Merge "Fix ActionBar layout bug when INVISIBLE." 2014-03-19 14:25:23 +00:00
Wei Wang
f305589f22 Add status callback for start/stop advertising. 
Fixes b/13289050, b/13418851, also fixes 13418671.

Change-Id: I231ba51aaa67b1f917e476ef0f2c8f82c762df77
 2014-03-18 19:33:16 -07: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
George Mount
14a9738330 Fix ActionBar layout bug when INVISIBLE. 
ActionBar did not layout properly when INVISIBLE, but worked
when VISIBLE or GONE.

Change-Id: I30ca85377f3516c79174a35b65648d4ca68e927a
 2014-03-18 15:48:00 -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