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

99044 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Przemyslaw Szczepaniak
437932b972 am 9c4012b3: Make TextToSpeech.shutdown() work before init callback. 
* commit '9c4012b31b0c09cb14689bd96a71aae42c8a00cd':
  Make TextToSpeech.shutdown() work before init callback.
 2013-01-22 09:25:36 -08:00
Przemyslaw Szczepaniak
9c4012b31b Make TextToSpeech.shutdown() work before init callback. 
TextToSpeech.shutdown() never worked properly if was called before receiving
onServiceConnected in connection object. Also, due to recent changes,
TextToSpeech.shutdown() did not work until async task created in
onServiceConnected returned its result to the main thread.

This change makes .shutdown() work in all those cases. To allow that
runAction can now execute code with connection that's not fully setuped
- so we can shutt it down. Also, newly created connection is now hold in
new member variable mConnectingServiceConnection, so it can be closed
before receiving onServiceConnected callback.

Also, I changed name of OnServiceConnectedAsyncTask to
SetupConnectionAsyncTask, I find it more descriptive.

Bug: 8003757
Change-Id: I41d84cfdb8fa28fe44235fb4a9764fa8f3d0643c
 2013-01-22 17:20:37 +00:00
Irfan Sheriff
6156163684 am b3608ad8: Merge "eix enterprise config storage bugs" 
* commit 'b3608ad87739a8ec087a498d8c9397caf01f7738':
  eix enterprise config storage bugs
 2013-01-19 10:20:51 -08:00
Irfan Sheriff
b3608ad877 Merge "eix enterprise config storage bugs" 2013-01-19 18:16:18 +00:00
Irfan Sheriff
e095675c87 eix enterprise config storage bugs 
Reading empty and not updating was resulting in retaining old values
in a config. Also, fix matching phase2 entries.

Additionally, allow configuring subset of enterprise fields. Necessary
since password cannot be read back from supplicant.

Change-Id: I83a01690a0cf7cad1457a674f50f1e3a1a0441b5
 2013-01-19 09:53:46 -08:00
Stephen Hines
75f8e8a9ba am 64cae1a6: Merge "Revert "Move RSTest to compatibility library."" 
* commit '64cae1a608c196c2bd1d9e7cfd2a1632fd0e5b83':
  Revert "Move RSTest to compatibility library."
 2013-01-18 18:55:52 -08:00
Dianne Hackborn
d9c71435ca am cc743347: Merge "New API to get app op information about a single package." 
* commit 'cc7433470f00fac3bbe7835de3ded4b9bf121244':
  New API to get app op information about a single package.
 2013-01-18 18:51:48 -08:00
Stephen Hines
64cae1a608 Merge "Revert "Move RSTest to compatibility library."" 2013-01-19 02:49:09 +00:00
Dianne Hackborn
cc7433470f Merge "New API to get app op information about a single package." 2013-01-19 02:47:29 +00:00
Stephen Hines
5cb9037818 Revert "Move RSTest to compatibility library." 
This reverts commit 36103c80b1d258157f0f4b531bc02f2fbb9e2d40.
 2013-01-18 18:47:00 -08:00
Dianne Hackborn
72e3983d38 New API to get app op information about a single package. 
Change-Id: I986453d9bb4161da467fb820b12502464e936483
 2013-01-18 18:36:09 -08:00
Michael Wright
48f62a416f am 7bf6a5c3: Merge "Adds enum value for KEYCODE_ASSIST" 
* commit '7bf6a5c3c712b1785cb76d0fecd7b35ad25d4bb2':
  Adds enum value for KEYCODE_ASSIST
 2013-01-18 18:23:26 -08:00
Michael Wright
7bf6a5c3c7 Merge "Adds enum value for KEYCODE_ASSIST" 2013-01-19 02:19:09 +00:00
Tim Murray
43b1922780 am 878749fe: Merge "Move RSTest to compatibility library." 
* commit '878749fef09c7cb5894f77d9b032f876f9476e47':
  Move RSTest to compatibility library.
 2013-01-18 17:28:24 -08:00
Tim Murray
878749fef0 Merge "Move RSTest to compatibility library." 2013-01-19 01:26:13 +00:00
Jeff Sharkey
51ee44303f am e95724ae: Merge "Add LongSparseLongArray with tests." 
* commit 'e95724aebec3a4a121fde3dfba761b80d2cd6922':
  Add LongSparseLongArray with tests.
 2013-01-18 17:10:39 -08:00
Romain Guy
7d4f807b83 am 49464796: Merge "Allow layers with a stencil buffer to be resized on the fly Bug #7146141" 
* commit '494647961feb21d925d5e6e5ce1d42aa8b6949db':
  Allow layers with a stencil buffer to be resized on the fly Bug #7146141
 2013-01-18 17:08:12 -08:00
Jeff Sharkey
e95724aebe Merge "Add LongSparseLongArray with tests." 2013-01-19 01:07:54 +00:00
Romain Guy
494647961f Merge "Allow layers with a stencil buffer to be resized on the fly Bug #7146141" 2013-01-19 01:03:39 +00:00
Jeff Sharkey
dda73b5dcd Add LongSparseLongArray with tests. 
Change-Id: Iae32ba7647601c587e30834379d7d3c2235c75b0
 2013-01-18 16:59:14 -08:00
Romain Guy
2055abaa0a Allow layers with a stencil buffer to be resized on the fly 
Bug #7146141

This change moves the resizeLayer() from LayerCache (where it should
never have been anyway) to Layer. This makes a little more sense.

Change-Id: I8b2f9c19c558e738405a58b9e71ec5799fc6be88
 2013-01-18 16:42:51 -08:00
Robert Greenwalt
02f63f77c2 am 20da885c: Merge "Revert "Second pass tying into dns cache per interface"" 
* commit '20da885caa27ee8148c61be0ff56451ad6bf8146':
  Revert "Second pass tying into dns cache per interface"
 2013-01-18 16:39:07 -08:00
Robert Greenwalt
20da885caa Merge "Revert "Second pass tying into dns cache per interface"" 2013-01-19 00:36:12 +00:00
Robert Greenwalt
63837f455d Revert "Second pass tying into dns cache per interface" 
This reverts commit f60f94a89e49c125f4aff6496710a0fb66579545

Change-Id: If52dffd5100a6b03275da0eabfa05e24c5ecada9
 2013-01-19 00:34:07 +00:00
Tim Murray
36103c80b1 Move RSTest to compatibility library. 
Change-Id: I486f485fe9798d81dcd8e1ca9001bb851bcfc9b8
 2013-01-18 16:28:02 -08:00
Dianne Hackborn
c152e16b07 am 8fea4e72: Merge "Rework ParceledListSlice to be much easier to use." 
* commit '8fea4e72e4dcff9fa76168b9e26cf5907102f70b':
  Rework ParceledListSlice to be much easier to use.
 2013-01-18 16:20:40 -08:00
Dianne Hackborn
8fea4e72e4 Merge "Rework ParceledListSlice to be much easier to use." 2013-01-19 00:18:40 +00:00
Kristian Monsen
53277e977d am 21af9258: Merge "Better detecting if current threasd is main thread" 
* commit '21af9258f37dd9ea9e9ae66ce609d104faac48d6':
  Better detecting if current threasd is main thread
 2013-01-18 16:01:50 -08:00
Stephen Hines
b113273a8c am 70b900cd: Merge "Actually test fract(float)." 
* commit '70b900cded1e8b5955509630ac6370688a3481cb':
  Actually test fract(float).
 2013-01-18 16:01:50 -08:00
Stephen Hines
2123214e86 Actually test fract(float). 
Change-Id: I402c7ea43ea626f9748982919cb3753015df3da7
 2013-01-18 16:01:46 -08:00
Kristian Monsen
21af9258f3 Merge "Better detecting if current threasd is main thread" 2013-01-18 23:58:33 +00:00
Stephen Hines
70b900cded Merge "Actually test fract(float)." 2013-01-18 23:36:12 +00:00
Ben Murdoch
ba900bf947 am 03d366e8: Merge "Refactor FindActionModeCallback." 
* commit '03d366e89c11352aa0ba3ff7038f371211d1ce4e':
  Refactor FindActionModeCallback.
 2013-01-18 15:29:13 -08:00
Ben Murdoch
03d366e89c Merge "Refactor FindActionModeCallback." 2013-01-18 23:26:12 +00:00
Ben Murdoch
52c9f7f950 Refactor FindActionModeCallback. 
Refactor FindActionModeCallback to make it more suitable
for sharing between WebViewClassic and WebViewChromium.

Bug=5006564

Change-Id: Ic3156eb50f99033a17ba3f83d0b4f39ba992afa8
 2013-01-18 23:18:09 +00:00
Kristian Monsen
0a30328c10 Better detecting if current threasd is main thread 
Old approach got broken after:
https://googleplex-android-review.googlesource.com/#/c/266421/2

Change-Id: I12ae23efdbaebd8ba24acb1b7eff75c912d24f1d
 2013-01-18 14:50:07 -08:00
Dake Gu
ef1215d98b am ebf7c743: am 85a06152: am fe88f1be: Merge "Fix bug of SimulatedTrackball" into jb-mr1-aah-dev 
* commit 'ebf7c74361baefb826591bd90cdacd9244a2eb59':
  Fix bug of SimulatedTrackball
 2013-01-18 14:08:22 -08:00
Dake Gu
ebf7c74361 am 85a06152: am fe88f1be: Merge "Fix bug of SimulatedTrackball" into jb-mr1-aah-dev 
* commit '85a06152ce9b7d3a198639eb1918a9c2a3fd34d4':
  Fix bug of SimulatedTrackball
 2013-01-18 14:01:57 -08:00
Dake Gu
85a06152ce am fe88f1be: Merge "Fix bug of SimulatedTrackball" into jb-mr1-aah-dev 
* commit 'fe88f1be3d197987a874f6c29fefdeb11db183f6':
  Fix bug of SimulatedTrackball
 2013-01-18 13:26:02 -08:00
Dake Gu
fe88f1be3d Merge "Fix bug of SimulatedTrackball" into jb-mr1-aah-dev 2013-01-18 21:22:45 +00:00
Dianne Hackborn
d8e1dbb6bc Rework ParceledListSlice to be much easier to use. 
Take advantage of this to return better information about
packages filtered by permissions -- include the permissions
they have in the requested array.

Also fix issue #8026793 (Contact picture shows default pic
while searching for a contact in qsb) by using the base
package name of the Context when reporting the app name
of an operation.  Otherwise you could make a resource-only
context for another application and do calls through that
and get reported as the wrong app.

Change-Id: I5e0488bf773acea5a3d22f245641828e1a106fb8
 2013-01-18 13:02:26 -08:00
Derek Sollenberger
dd1810cdbd Merge "Update enum value to match those in the native header." into master-chromium 2013-01-18 20:11:19 +00:00
Derek Sollenberger
70336dd0eb Update enum value to match those in the native header. 
Change-Id: Idfb921ecd138baa8570ac1e92bdeb291dbf9207e
 2013-01-18 14:33:50 -05:00
Victoria Lease
dc0c8a353b am f25febf0: (-s ours) am 00ef2a36: (-s ours) am c62eefa0: am 3599f0a0: (-s ours) am 0cf97d32: (-s ours) Merge "DO NOT MERGE Prevent OOM death for services under ServiceWatcher\'s care." into jb-mr1.1-dev 
* commit 'f25febf01453733e8bdd1ac241ecd9d3bcbef475':
  DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care.
 2013-01-18 10:58:55 -08:00
Victoria Lease
f25febf014 am 00ef2a36: (-s ours) am c62eefa0: am 3599f0a0: (-s ours) am 0cf97d32: (-s ours) Merge "DO NOT MERGE Prevent OOM death for services under ServiceWatcher\'s care." into jb-mr1.1-dev 
* commit '00ef2a3622baa477d7dfdd8df7d68bab84008b4d':
  DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care.
 2013-01-18 10:57:06 -08:00
Victoria Lease
00ef2a3622 am c62eefa0: am 3599f0a0: (-s ours) am 0cf97d32: (-s ours) Merge "DO NOT MERGE Prevent OOM death for services under ServiceWatcher\'s care." into jb-mr1.1-dev 
* commit 'c62eefa02aefb0bf3870e063aa47df6dccbf5862':
  DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care.
 2013-01-18 10:53:48 -08:00
Victoria Lease
c62eefa02a am 3599f0a0: (-s ours) am 0cf97d32: (-s ours) Merge "DO NOT MERGE Prevent OOM death for services under ServiceWatcher\'s care." into jb-mr1.1-dev 
* commit '3599f0a02129c238177806ce3d6db20853230d4d':
  DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care.
 2013-01-18 10:51:25 -08:00
Victoria Lease
3599f0a021 am 0cf97d32: (-s ours) Merge "DO NOT MERGE Prevent OOM death for services under ServiceWatcher\'s care." into jb-mr1.1-dev 
* commit '0cf97d32178b689184866e731c0a4105d8223d80':
  DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care.
 2013-01-18 10:49:07 -08:00
Wink Saville
0120602c58 am 52dda54b: Merge "Clean up published network condition reporting." 
* commit '52dda54b081f3a3fb1cc475128eec820e3d5b21e':
  Clean up published network condition reporting.
 2013-01-18 10:44:33 -08:00
Victoria Lease
0cf97d3217 Merge "DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care." into jb-mr1.1-dev 2013-01-18 18:43:11 +00:00