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

118476 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
f9262149c2 Import translations. DO NOT MERGE 
Change-Id: I6a172dbe72caf48442610101a7092737175c19e5
Auto-generated-cl: translation import
 2013-10-28 09:22:35 -07:00
Baligh Uddin
4aef4ca530 Import translations. DO NOT MERGE 
Change-Id: I74c7510762c6c2591784ea2997695449f8aa2e53
Auto-generated-cl: translation import
 2013-10-28 09:19:49 -07:00
Lajos Molnar
4de8e7c1a5 MediaPlayer: MTP: update state only based on source events 
State only depends on events from the MediaPlayer (this includes
the pseudo-event from MTP recovery mechanism.)

Change-Id: Idd62a773d2386ad6bfbfe417412c2e2ff09b3600
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 11412881
 2013-10-28 09:19:26 -07:00
Jeff Sharkey
99dcb2eb35 am 10e509dc: Merge "Use inotify to update DocumentsUI." into klp-dev 
* commit '10e509dcc20da34b79bc4616cc795a3720ddad49':
  Use inotify to update DocumentsUI.
 2013-10-28 09:14:37 -07:00
Jeff Sharkey
10e509dcc2 Merge "Use inotify to update DocumentsUI." into klp-dev 2013-10-28 16:12:16 +00:00
Sungmin Choi
119e24f987 Do not show roaming icon for Videotron operator when access Canada network 
Bug: 11260638
Change-Id: I70b3c2c190707b41ca04110851b7c9581d1c196f
 2013-10-28 09:11:36 -07:00
Craig Mautner
f65dd21390 am 2534c16b: am dfe0d9a0: Merge "Change order of operations so flag is not overwritten" into klp-dev 
* commit '2534c16b44922e19e040a999cd99b412674e63a1':
  Change order of operations so flag is not overwritten
 2013-10-28 07:44:08 -07:00
Craig Mautner
2534c16b44 am dfe0d9a0: Merge "Change order of operations so flag is not overwritten" into klp-dev 
* commit 'dfe0d9a040707c72aab20c54718d0b5f1bab56ff':
  Change order of operations so flag is not overwritten
 2013-10-28 07:40:47 -07:00
Craig Mautner
dfe0d9a040 Merge "Change order of operations so flag is not overwritten" into klp-dev 2013-10-28 14:38:32 +00:00
Andrew Flynn
0c3e1df77f Check for presence of carrier app in data notification. 
When ConnectivityService checks the mobile data connection and notices that
there is no connectivity, first do a check to see if a valid carrier app for
the current MCC/MNC exists. If so, launch that app instead of checking for a
provisioning URL or hoping for a DNS redirect in the browser. If no such app
exists, continue on as normal.

Bug: 9622645
Change-Id: Ic88b06250af89825d8eee7e4945fb8d7c28d16e1
 2013-10-26 11:04:32 -07:00
Siva Velusamy
5aa495cb87 am 5894e737: am 09675799: am 334d98f1: am 9e4514cd: am 4062ae2e: am 3ebe71cb: Update AS download page for v0.3.1 
* commit '5894e7378b7cd1a2e4549fcfd62d7f30e5463c26':
  Update AS download page for v0.3.1
 2013-10-25 18:52:20 -07:00
Siva Velusamy
5894e7378b am 09675799: am 334d98f1: am 9e4514cd: am 4062ae2e: am 3ebe71cb: Update AS download page for v0.3.1 
* commit '09675799a01d920c58ea1393eaae4756d211215c':
  Update AS download page for v0.3.1
 2013-10-25 18:48:42 -07:00
Siva Velusamy
09675799a0 am 334d98f1: am 9e4514cd: am 4062ae2e: am 3ebe71cb: Update AS download page for v0.3.1 
* commit '334d98f1ece949414b94924a5bc852810e0bf367':
  Update AS download page for v0.3.1
 2013-10-25 18:46:14 -07:00
Siva Velusamy
334d98f1ec am 9e4514cd: am 4062ae2e: am 3ebe71cb: Update AS download page for v0.3.1 
* commit '9e4514cd06592dc5cc81638699dc9d17065d42d2':
  Update AS download page for v0.3.1
 2013-10-25 18:42:42 -07:00
Siva Velusamy
9e4514cd06 am 4062ae2e: am 3ebe71cb: Update AS download page for v0.3.1 
* commit '4062ae2ef958b009e8c2850ad249e45df1d476aa':
  Update AS download page for v0.3.1
 2013-10-25 18:40:40 -07:00
Siva Velusamy
4062ae2ef9 am 3ebe71cb: Update AS download page for v0.3.1 
* commit '3ebe71cb933d99461dfb3702fb4977f966df3713':
  Update AS download page for v0.3.1
 2013-10-25 18:37:35 -07:00
Christopher Tate
c95bae5010 am 13c4645b: am f7d74870: am 6364c26c: Merge "Un-deprecate setInexactRepeating() and tweak docs" into klp-dev 
* commit '13c4645bfc9c3bbd6ae2508ef8cc24412fe237c8':
  Un-deprecate setInexactRepeating() and tweak docs
 2013-10-25 18:22:26 -07:00
Jeff Sharkey
8b5f453a82 am de9b66fe: am 3ac436b7: am 80f103ae: Merge "Extra to always show advanced devices." into klp-dev 
* commit 'de9b66fee1bdbc914c287fb9a2aa832dc2d3e6f9':
  Extra to always show advanced devices.
 2013-10-25 18:22:22 -07:00
Christopher Tate
13c4645bfc am f7d74870: am 6364c26c: Merge "Un-deprecate setInexactRepeating() and tweak docs" into klp-dev 
* commit 'f7d74870db6f8b1275d4b93268b0210e351647b3':
  Un-deprecate setInexactRepeating() and tweak docs
 2013-10-25 18:17:56 -07:00
Jeff Sharkey
de9b66fee1 am 3ac436b7: am 80f103ae: Merge "Extra to always show advanced devices." into klp-dev 
* commit '3ac436b758830eb938c62d5ed91caa7808b5b63e':
  Extra to always show advanced devices.
 2013-10-25 18:17:52 -07:00
Christopher Tate
f7d74870db am 6364c26c: Merge "Un-deprecate setInexactRepeating() and tweak docs" into klp-dev 
* commit '6364c26cb385ea654b7c8af8a1ef2f5cb4a556c2':
  Un-deprecate setInexactRepeating() and tweak docs
 2013-10-25 18:13:36 -07:00
Jeff Sharkey
3ac436b758 am 80f103ae: Merge "Extra to always show advanced devices." into klp-dev 
* commit '80f103ae12c4eb90fc2e06a6921dde2f092a181b':
  Extra to always show advanced devices.
 2013-10-25 18:13:33 -07:00
Jeff Sharkey
db5ef12500 Use inotify to update DocumentsUI. 
While user is actively looking at a directory, subscribe to inotify
events and notify of content changes to trigger requeries.  Reference
count the observers, since multiple cursors are regularly open during
requeries.

Fix leaking cursors on activity rotation; crazy loader ID generation
is no longer needed.

Bug: 10999396
Change-Id: Iddeb08a056fee80c93df8499874705bcd213a1e2
 2013-10-25 17:51:04 -07:00
Christopher Tate
6364c26cb3 Merge "Un-deprecate setInexactRepeating() and tweak docs" into klp-dev 2013-10-26 00:42:01 +00:00
Siva Velusamy
3ebe71cb93 Update AS download page for v0.3.1 
Change-Id: Ie9ba2f69d4e1398dd566f1b2024843f88d250dda
 2013-10-25 17:27:59 -07:00
Jeff Sharkey
80f103ae12 Merge "Extra to always show advanced devices." into klp-dev 2013-10-26 00:24:04 +00:00
Christopher Tate
109e4db471 Un-deprecate setInexactRepeating() and tweak docs 
Bug 10461371

Change-Id: Ic62a0e94c83c0c7b50e21a7bee19c3d92255d231
 2013-10-25 16:55:36 -07:00
Dianne Hackborn
e77187d018 Fix issue #11391003: Allow dumpsys meminfo to be used with native processes 
Change-Id: I005e4dc763deafac95dc3aa6261c06d1808fdaff
 2013-10-25 16:32:41 -07:00
Jeff Sharkey
96c620595b Extra to always show advanced devices. 
Also always lower-case extension to extract MIME type correctly,
we may want to fix in MimeUtils at some point.

Bug: 11354402
Change-Id: I77d0c06a663cd0c4320c41553ff1980b6f9a7778
 2013-10-25 16:30:54 -07:00
Dianne Hackborn
b251e0794a am 33c7520b: am 0b1ec016: am 19d79659: Merge "Fix issue #11374840: adb shell am startservice not working any more" into klp-dev 
* commit '33c7520b68e015c46ed1bcb277dc4faaa368cc55':
  Fix issue #11374840: adb shell am startservice not working any more
 2013-10-25 16:14:19 -07:00
Igor Murashkin
560ce7738c am ee46eab2: am ba111ef9: am c802a661: Merge "Trace: add ALOGVs for easier debugging" into klp-dev 
* commit 'ee46eab2d026c9d22d6243cc945c150c877edc16':
  Trace: add ALOGVs for easier debugging
 2013-10-25 16:14:10 -07:00
Christopher Tate
dde92b755f am 66f6fa7b: am 9a995257: am 6aedab9b: Merge "DOCS: document API 19+ Alarm Manager API and behaviors" into klp-dev 
* commit '66f6fa7b3617ecf919d879157d6205321685db61':
  DOCS: document API 19+ Alarm Manager API and behaviors
 2013-10-25 16:14:04 -07:00
Marco Nelissen
33b6b96686 am a22010eb: (-s ours) am d19385bf: am 21657181: Merge "Add a method to set a list of uids for a wake lock" into klp-dev 
* commit 'a22010ebe533aafe1b3d488128f3df757f306dd0':
  Add a method to set a list of uids for a wake lock
 2013-10-25 16:13:59 -07:00
Dianne Hackborn
33c7520b68 am 0b1ec016: am 19d79659: Merge "Fix issue #11374840: adb shell am startservice not working any more" into klp-dev 
* commit '0b1ec0165a5dc98bc82670288894af446ff5bcaa':
  Fix issue #11374840: adb shell am startservice not working any more
 2013-10-25 15:37:30 -07:00
Dianne Hackborn
0b1ec0165a am 19d79659: Merge "Fix issue #11374840: adb shell am startservice not working any more" into klp-dev 
* commit '19d79659ee4c0e85775422ccbed3fa14c82fa66b':
  Fix issue #11374840: adb shell am startservice not working any more
 2013-10-25 15:32:21 -07:00
Dianne Hackborn
19d79659ee Merge "Fix issue #11374840: adb shell am startservice not working any more" into klp-dev 2013-10-25 22:30:35 +00:00
Igor Murashkin
ee46eab2d0 am ba111ef9: am c802a661: Merge "Trace: add ALOGVs for easier debugging" into klp-dev 
* commit 'ba111ef9b5ed90d6b5021086548fcc9c35953ecf':
  Trace: add ALOGVs for easier debugging
 2013-10-25 15:17:31 -07:00
Igor Murashkin
ba111ef9b5 am c802a661: Merge "Trace: add ALOGVs for easier debugging" into klp-dev 
* commit 'c802a6614095660bccfd0cdf4f15404ad1863b76':
  Trace: add ALOGVs for easier debugging
 2013-10-25 15:15:12 -07:00
Igor Murashkin
c802a66140 Merge "Trace: add ALOGVs for easier debugging" into klp-dev 2013-10-25 22:11:07 +00:00
Christopher Tate
66f6fa7b36 am 9a995257: am 6aedab9b: Merge "DOCS: document API 19+ Alarm Manager API and behaviors" into klp-dev 
* commit '9a9952571a19eb849558885215b0bbe564a9176c':
  DOCS: document API 19+ Alarm Manager API and behaviors
 2013-10-25 15:06:15 -07:00
Christopher Tate
9a9952571a am 6aedab9b: Merge "DOCS: document API 19+ Alarm Manager API and behaviors" into klp-dev 
* commit '6aedab9b64b0ba23ffb760f5b6b8c45675372030':
  DOCS: document API 19+ Alarm Manager API and behaviors
 2013-10-25 15:02:53 -07:00
Marco Nelissen
a22010ebe5 am d19385bf: am 21657181: Merge "Add a method to set a list of uids for a wake lock" into klp-dev 
* commit 'd19385bf58225069c8ea0a7ce5075ed28861b039':
  Add a method to set a list of uids for a wake lock
 2013-10-25 15:01:34 -07:00
Christopher Tate
6aedab9b64 Merge "DOCS: document API 19+ Alarm Manager API and behaviors" into klp-dev 2013-10-25 21:59:41 +00:00
Marco Nelissen
d19385bf58 am 21657181: Merge "Add a method to set a list of uids for a wake lock" into klp-dev 
* commit '2165718153c1288dee7e106f0c61d952f515600b':
  Add a method to set a list of uids for a wake lock
 2013-10-25 14:58:12 -07:00
Marco Nelissen
2165718153 Merge "Add a method to set a list of uids for a wake lock" into klp-dev 2013-10-25 21:55:55 +00:00
Dianne Hackborn
de0e83bc39 Fix issue #11374840: adb shell am startservice not working any more 
The startService() and stopServie() calls had a redundant check for
the incoming user ID being valid, but with its own custom implementation
that doesn't match the normal handleIncomingUser flow.  In fact, for
both of these we are going to do handleIncomingUser anyway when we get
to retrieveServiceLocked(), so there was just no need for this.

Change-Id: I14409a03781a14a5f1a786aceb31dcc77efb062c
 2013-10-25 14:34:18 -07:00
Svetoslav Ganov
9f598351ca am 01b1e661: am 1aae2c47: am 2a40da55: Merge "Update the documentaton of the android.print package." into klp-dev 
* commit '01b1e66135f3e727be47300510443d149d8679cd':
  Update the documentaton of the android.print package.
 2013-10-25 14:04:56 -07:00
Jean-Michel Trivi
cfcd53a815 am 33f713d2: am a60057c0: am d4249251: Merge "Limit RemoteControlClient generation ID changes" into klp-dev 
* commit '33f713d2b3663ac05d145a0d971b009d9e0988a7':
  Limit RemoteControlClient generation ID changes
 2013-10-25 14:04:52 -07:00
John Spurlock
7534df88fc resolved conflicts for merge of 286291bf to master 
Change-Id: Ied118f11f0a070b610e4edc4695a07418dcf7ce9
 2013-10-25 17:01:46 -04:00
Christopher Tate
062bce7d87 DOCS: document API 19+ Alarm Manager API and behaviors 
Bug 9941334

Change-Id: I65473bd62f7113c74ed6277d61db56c76441ff1b
 2013-10-25 13:59:44 -07:00